diff --git a/.github/actions/config/action.yml b/.github/actions/config/action.yml
index 931988accc3..bf86a946415 100644
--- a/.github/actions/config/action.yml
+++ b/.github/actions/config/action.yml
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/.github/actions/do-build/action.yml b/.github/actions/do-build/action.yml
index 79eddf8c70f..252105f29fd 100644
--- a/.github/actions/do-build/action.yml
+++ b/.github/actions/do-build/action.yml
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/.github/actions/get-bootjdk/action.yml b/.github/actions/get-bootjdk/action.yml
index 25ee1d8dfa0..312fb642c82 100644
--- a/.github/actions/get-bootjdk/action.yml
+++ b/.github/actions/get-bootjdk/action.yml
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/.github/actions/get-bundles/action.yml b/.github/actions/get-bundles/action.yml
index 0e52320a350..aaec9a6d19f 100644
--- a/.github/actions/get-bundles/action.yml
+++ b/.github/actions/get-bundles/action.yml
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/.github/actions/get-msys2/action.yml b/.github/actions/get-msys2/action.yml
index 82022a6e233..4ca5d2ab847 100644
--- a/.github/actions/get-msys2/action.yml
+++ b/.github/actions/get-msys2/action.yml
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/.github/scripts/gen-build-failure-report.sh b/.github/scripts/gen-build-failure-report.sh
index 2dda69a3f33..65849d2e26e 100644
--- a/.github/scripts/gen-build-failure-report.sh
+++ b/.github/scripts/gen-build-failure-report.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/.github/scripts/gen-test-summary.sh b/.github/scripts/gen-test-summary.sh
index a612bed5527..3d54be8c5db 100644
--- a/.github/scripts/gen-test-summary.sh
+++ b/.github/scripts/gen-test-summary.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/.github/workflows/build-cross-compile.yml b/.github/workflows/build-cross-compile.yml
index 8e97ff4439f..3f4ba67f996 100644
--- a/.github/workflows/build-cross-compile.yml
+++ b/.github/workflows/build-cross-compile.yml
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/.github/workflows/test.yml b/.github/workflows/test.yml
index 3517fa53941..99aaf9650a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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,7 +66,6 @@ jobs:
- 'hs/tier1 compiler part 1'
- 'hs/tier1 compiler part 2'
- 'hs/tier1 compiler part 3'
- - 'hs/tier1 compiler not-xcomp'
- 'hs/tier1 gc'
- 'hs/tier1 runtime'
- 'hs/tier1 serviceability'
@@ -101,10 +100,6 @@ jobs:
test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
debug-suffix: -debug
- - test-name: 'hs/tier1 compiler not-xcomp'
- test-suite: 'test/hotspot/jtreg/:tier1_compiler_not_xcomp'
- debug-suffix: -debug
-
- test-name: 'hs/tier1 gc'
test-suite: 'test/hotspot/jtreg/:tier1_gc'
debug-suffix: -debug
diff --git a/doc/building.html b/doc/building.html
index cd73863f879..7157848f561 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -863,12 +863,12 @@ <h3 id="gnu-bash">GNU Bash</h3>
are supported.</p>
<p>At least version 3.2 of GNU Bash must be used.</p>
<h3 id="graphviz-and-pandoc">Graphviz and Pandoc</h3>
-<p>In order to build the full docs (see the
+<p>In order to build man pages and the full docs (see the
<code>--enable-full-docs</code> configure option) <a
-href="https://www.graphviz.org">Graphviz</a> and <a
-href="https://pandoc.org">Pandoc</a> are required. Any recent versions
-should work. For reference, and subject to change, Oracle builds use
-Graphviz 9.0.0 and Pandoc 2.19.2.</p>
+href="https://pandoc.org">Pandoc</a> is required. For full docs also <a
+href="https://www.graphviz.org">Graphviz</a> is required. Any recent
+versions should work. For reference, and subject to change, Oracle
+builds use Graphviz 9.0.0 and Pandoc 2.19.2.</p>
<h2 id="running-configure">Running Configure</h2>
<p>To build the JDK, you need a "configuration", which consists of a
directory where to store the build output, coupled with information
diff --git a/doc/building.md b/doc/building.md
index 99bc509dc70..04db6e94d1c 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -680,9 +680,9 @@ At least version 3.2 of GNU Bash must be used.
### Graphviz and Pandoc
-In order to build the full docs (see the `--enable-full-docs`
-configure option) [Graphviz](https://www.graphviz.org) and
-[Pandoc](https://pandoc.org) are required. Any recent versions should
+In order to build man pages and the full docs (see the `--enable-full-docs`
+configure option) [Pandoc](https://pandoc.org) is required. For full docs also
+[Graphviz](https://www.graphviz.org) is required. Any recent versions should
work. For reference, and subject to change, Oracle builds use Graphviz
9.0.0 and Pandoc 2.19.2.
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 49f64a8b9ae..1fa2328afd8 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/CompileModuleTools.gmk b/make/CompileModuleTools.gmk
index 0a3039b34d2..888b8418eea 100644
--- a/make/CompileModuleTools.gmk
+++ b/make/CompileModuleTools.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/CopyImportModules.gmk b/make/CopyImportModules.gmk
index 52515ebd314..69a42f166ba 100644
--- a/make/CopyImportModules.gmk
+++ b/make/CopyImportModules.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/CopyInterimTZDB.gmk b/make/CopyInterimTZDB.gmk
index e2704b32975..1e54cd8af11 100644
--- a/make/CopyInterimTZDB.gmk
+++ b/make/CopyInterimTZDB.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/Global.gmk b/make/Global.gmk
index 3e6721f994c..86487c1c2fc 100644
--- a/make/Global.gmk
+++ b/make/Global.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/Images.gmk b/make/Images.gmk
index 86f5073e6c3..ad1e2c9f63a 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -29,6 +29,7 @@ include $(SPEC)
include MakeBase.gmk
include CopyFiles.gmk
+include DebugInfoUtils.gmk
include Execute.gmk
include Modules.gmk
include Utils.gmk
diff --git a/make/Init.gmk b/make/Init.gmk
index 8918de7d16e..f2cfe3625a5 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/JrtfsJar.gmk b/make/JrtfsJar.gmk
index 55e0c150b3b..e1b3965ba04 100644
--- a/make/JrtfsJar.gmk
+++ b/make/JrtfsJar.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/MacBundles.gmk b/make/MacBundles.gmk
index 8ed6476c506..13b80b8e56e 100644
--- a/make/MacBundles.gmk
+++ b/make/MacBundles.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/MainSupport.gmk b/make/MainSupport.gmk
index ca284e21dd0..5a5e40d025a 100644
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index ce5d254ccc4..95ad239e846 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/StaticLibs.gmk b/make/StaticLibs.gmk
index 78918c456ee..d54c67b50b3 100644
--- a/make/StaticLibs.gmk
+++ b/make/StaticLibs.gmk
@@ -29,6 +29,7 @@ include $(SPEC)
include MakeBase.gmk
include CopyFiles.gmk
+include DebugInfoUtils.gmk
include Modules.gmk
include modules/LauncherCommon.gmk
@@ -97,10 +98,8 @@ EXTERNAL_LIBS := $(strip $(shell $(CAT) $(LIB_FLAGS_FILES) | \
ifeq ($(call isTargetOs, macosx), true)
STATIC_LIBS := $(addprefix -force_load$(SPACE), $(STATIC_LIB_FILES))
- STANDARD_LIBS += -lstdc++
else ifeq ($(call isTargetOs, linux), true)
STATIC_LIBS := -Wl,--export-dynamic -Wl,--whole-archive $(STATIC_LIB_FILES) -Wl,--no-whole-archive
- STANDARD_LIBS := -l:libstdc++.a
else ifeq ($(call isTargetOs, windows), true)
STATIC_LIBS := $(addprefix -wholearchive:, $(STATIC_LIB_FILES))
else
@@ -114,7 +113,8 @@ $(eval $(call SetupBuildLauncher, java, \
OPTIMIZATION := HIGH, \
STATIC_LAUNCHER := true, \
LDFLAGS := $(LDFLAGS_STATIC_JDK), \
- LIBS := $(STATIC_LIBS) $(EXTERNAL_LIBS) $(STANDARD_LIBS), \
+ LIBS := $(STATIC_LIBS) $(EXTERNAL_LIBS), \
+ LINK_TYPE := C++, \
OUTPUT_DIR := $(STATIC_LAUNCHER_OUTPUT_DIR), \
OBJECT_DIR := $(STATIC_LAUNCHER_OUTPUT_DIR), \
))
diff --git a/make/StaticLibsImage.gmk b/make/StaticLibsImage.gmk
index 6a85701a788..6a181ff262f 100644
--- a/make/StaticLibsImage.gmk
+++ b/make/StaticLibsImage.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/TestImage.gmk b/make/TestImage.gmk
index e503f1cea2c..5c788a8d0a6 100644
--- a/make/TestImage.gmk
+++ b/make/TestImage.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/ToolsHotspot.gmk b/make/ToolsHotspot.gmk
index df779d961fd..f53d851c0b7 100644
--- a/make/ToolsHotspot.gmk
+++ b/make/ToolsHotspot.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/ToolsJdk.gmk b/make/ToolsJdk.gmk
index 402c6841191..98287473f3e 100644
--- a/make/ToolsJdk.gmk
+++ b/make/ToolsJdk.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/Makefile.template b/make/autoconf/Makefile.template
index ee33d0dfb9e..63ced4c75d8 100644
--- a/make/autoconf/Makefile.template
+++ b/make/autoconf/Makefile.template
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/bootcycle-spec.gmk.template b/make/autoconf/bootcycle-spec.gmk.template
index a476fe8a27e..8b6035606a5 100644
--- a/make/autoconf/bootcycle-spec.gmk.template
+++ b/make/autoconf/bootcycle-spec.gmk.template
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/build-aux/pkg.m4 b/make/autoconf/build-aux/pkg.m4
index ddb685e9bc3..fb36ad358da 100644
--- a/make/autoconf/build-aux/pkg.m4
+++ b/make/autoconf/build-aux/pkg.m4
@@ -1,7 +1,7 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 57654514eb6..259315bb23c 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -302,7 +302,7 @@ AC_DEFUN([FLAGS_SETUP_QUALITY_CHECKS],
AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
[
- if test "x$TOOLCHAIN_TYPE" = xgcc; then
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
C_O_FLAG_HIGHEST_JVM="-O3"
C_O_FLAG_HIGHEST="-O3"
C_O_FLAG_HI="-O3"
@@ -311,6 +311,13 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
C_O_FLAG_DEBUG="-O0"
C_O_FLAG_DEBUG_JVM="-O0"
C_O_FLAG_NONE="-O0"
+
+ if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
+ C_O_FLAG_HIGHEST_JVM="${C_O_FLAG_HIGHEST_JVM} -finline-functions"
+ C_O_FLAG_HIGHEST="${C_O_FLAG_HIGHEST} -finline-functions"
+ C_O_FLAG_HI="${C_O_FLAG_HI} -finline-functions"
+ fi
+
# -D_FORTIFY_SOURCE=2 hardening option needs optimization (at least -O1) enabled
# set for lower O-levels -U_FORTIFY_SOURCE to overwrite previous settings
if test "x$OPENJDK_TARGET_OS" = xlinux -a "x$DEBUG_LEVEL" = "xfastdebug"; then
@@ -331,21 +338,6 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
C_O_FLAG_DEBUG_JVM="${C_O_FLAG_DEBUG_JVM} ${DISABLE_FORTIFY_CFLAGS}"
C_O_FLAG_NONE="${C_O_FLAG_NONE} ${DISABLE_FORTIFY_CFLAGS}"
fi
- elif test "x$TOOLCHAIN_TYPE" = xclang; then
- if test "x$OPENJDK_TARGET_OS" = xaix; then
- C_O_FLAG_HIGHEST_JVM="-O3 -finline-functions"
- C_O_FLAG_HIGHEST="-O3 -finline-functions"
- C_O_FLAG_HI="-O3 -finline-functions"
- else
- C_O_FLAG_HIGHEST_JVM="-O3"
- C_O_FLAG_HIGHEST="-O3"
- C_O_FLAG_HI="-O3"
- fi
- C_O_FLAG_NORM="-O2"
- C_O_FLAG_DEBUG_JVM="-O0"
- C_O_FLAG_SIZE="-Os"
- C_O_FLAG_DEBUG="-O0"
- C_O_FLAG_NONE="-O0"
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
C_O_FLAG_HIGHEST_JVM="-O2 -Oy-"
C_O_FLAG_HIGHEST="-O2"
@@ -648,23 +640,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
# Linking is different on macOS
JVM_PICFLAG=""
fi
-
- # Extra flags needed when building optional static versions of certain
- # JDK libraries.
- STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
- if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
- STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -ffunction-sections -fdata-sections \
- -DJNIEXPORT='__attribute__((visibility(\"default\")))'"
- else
- STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -DJNIEXPORT="
- fi
- if test "x$TOOLCHAIN_TYPE" = xgcc; then
- # Disable relax-relocation to enable compatibility with older linkers
- RELAX_RELOCATIONS_FLAG="-Xassembler -mrelax-relocations=no"
- FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${RELAX_RELOCATIONS_FLAG}],
- IF_TRUE: [STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS ${RELAX_RELOCATIONS_FLAG}"])
- fi
- AC_SUBST(STATIC_LIBS_CFLAGS)
])
################################################################################
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 3df707d6bf3..3bff41b6321 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index d7619fe08f3..1f1f24fef38 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -121,7 +121,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
if test "x$DOT" != "x"; then
AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no, cannot generate full docs])
+ AC_MSG_RESULT([no, cannot generate full docs or man pages])
FULL_DOCS_AVAILABLE=false
fi
@@ -129,7 +129,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
if test "x$ENABLE_PANDOC" = "xtrue"; then
AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no, cannot generate full docs])
+ AC_MSG_RESULT([no, cannot generate full docs or man pages])
FULL_DOCS_AVAILABLE=false
fi
diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4
index 297a6e83b5c..52e00440795 100644
--- a/make/autoconf/jdk-version.m4
+++ b/make/autoconf/jdk-version.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/lib-alsa.m4 b/make/autoconf/lib-alsa.m4
index 8d0fb324cd0..3fd493c4d8e 100644
--- a/make/autoconf/lib-alsa.m4
+++ b/make/autoconf/lib-alsa.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/lib-bundled.m4 b/make/autoconf/lib-bundled.m4
index 6987250e906..091f01cadb5 100644
--- a/make/autoconf/lib-bundled.m4
+++ b/make/autoconf/lib-bundled.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/lib-freetype.m4 b/make/autoconf/lib-freetype.m4
index 9171b7bfc2a..8d524c8c8b9 100644
--- a/make/autoconf/lib-freetype.m4
+++ b/make/autoconf/lib-freetype.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/lib-x11.m4 b/make/autoconf/lib-x11.m4
index 6849b4a26c7..f1326b7ab85 100644
--- a/make/autoconf/lib-x11.m4
+++ b/make/autoconf/lib-x11.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 18770c6d360..2637285334b 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -429,8 +429,6 @@ LIBFFI_LIB_FILE := @LIBFFI_LIB_FILE@
FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
REPRODUCIBLE_CFLAGS := @REPRODUCIBLE_CFLAGS@
-STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
-
JMH_CORE_JAR := @JMH_CORE_JAR@
JMH_GENERATOR_JAR := @JMH_GENERATOR_JAR@
JMH_JOPT_SIMPLE_JAR := @JMH_JOPT_SIMPLE_JAR@
diff --git a/make/autoconf/util_paths.m4 b/make/autoconf/util_paths.m4
index d9277b7eb9c..7717150dfd9 100644
--- a/make/autoconf/util_paths.m4
+++ b/make/autoconf/util_paths.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/CopyFiles.gmk b/make/common/CopyFiles.gmk
index 4ed6c5906c7..8ba21677245 100644
--- a/make/common/CopyFiles.gmk
+++ b/make/common/CopyFiles.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/DebugInfoUtils.gmk b/make/common/DebugInfoUtils.gmk
new file mode 100644
index 00000000000..69d6c24b5e0
--- /dev/null
+++ b/make/common/DebugInfoUtils.gmk
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# 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.
+#
+
+ifeq ($(_MAKEBASE_GMK), )
+ $(error You must include MakeBase.gmk prior to including DebugInfoUtils.gmk)
+endif
+
+################################################################################
+#
+# Common debuginfo utility functions
+#
+################################################################################
+
+################################################################################
+# Find native debuginfo files in a directory
+#
+# Param 1 - dir to find debuginfo files in
+FindDebuginfoFiles = \
+ $(wildcard $(addprefix $1/*, $(DEBUGINFO_SUFFIXES)) \
+ $(addprefix $1/*/*, $(DEBUGINFO_SUFFIXES)) \
+ $(addprefix $1/*/*/*, $(DEBUGINFO_SUFFIXES)))
+
+# Pick the correct debug info files to copy, either zipped or not.
+ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
+ DEBUGINFO_SUFFIXES += .diz
+else
+ DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
+ # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
+ # dirs.
+ ifeq ($(call isTargetOs, macosx), true)
+ $(call FillFindCache, \
+ $(SUPPORT_OUTPUTDIR)/modules_libs $(SUPPORT_OUTPUTDIR)/modules_cmds)
+ FindDebuginfoFiles = \
+ $(if $(wildcard $1), $(call containing, .dSYM/, $(call FindFiles, $1)))
+ endif
+endif
diff --git a/make/common/Execute.gmk b/make/common/Execute.gmk
index abafe77a3c4..aa3c2e58813 100644
--- a/make/common/Execute.gmk
+++ b/make/common/Execute.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/FileUtils.gmk b/make/common/FileUtils.gmk
index d546ab94a58..d3cc4872ebb 100644
--- a/make/common/FileUtils.gmk
+++ b/make/common/FileUtils.gmk
@@ -307,26 +307,3 @@ ifeq ($(DISABLE_CACHE_FIND), true)
else
FindFiles = $(CacheFindFiles)
endif
-
-# Find native debuginfo files in a directory
-#
-# Param 1 - dir to find debuginfo files in
-FindDebuginfoFiles = \
- $(wildcard $(addprefix $1/*, $(DEBUGINFO_SUFFIXES)) \
- $(addprefix $1/*/*, $(DEBUGINFO_SUFFIXES)) \
- $(addprefix $1/*/*/*, $(DEBUGINFO_SUFFIXES)))
-
-# Pick the correct debug info files to copy, either zipped or not.
-ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
- DEBUGINFO_SUFFIXES += .diz
-else
- DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
- # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
- # dirs.
- ifeq ($(call isTargetOs, macosx), true)
- $(call FillFindCache, \
- $(SUPPORT_OUTPUTDIR)/modules_libs $(SUPPORT_OUTPUTDIR)/modules_cmds)
- FindDebuginfoFiles = \
- $(if $(wildcard $1), $(call containing, .dSYM/, $(call FindFiles, $1)))
- endif
-endif
diff --git a/make/common/MakeIO.gmk b/make/common/MakeIO.gmk
index b7843817b5e..e1806e9259a 100644
--- a/make/common/MakeIO.gmk
+++ b/make/common/MakeIO.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/Modules.gmk b/make/common/Modules.gmk
index 4d0d8b5d27e..625c25a0a2d 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/ProcessMarkdown.gmk b/make/common/ProcessMarkdown.gmk
index 960c4d66c30..d14c3ce4f76 100644
--- a/make/common/ProcessMarkdown.gmk
+++ b/make/common/ProcessMarkdown.gmk
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/TextFileProcessing.gmk b/make/common/TextFileProcessing.gmk
index 6746296df24..94aa259bebc 100644
--- a/make/common/TextFileProcessing.gmk
+++ b/make/common/TextFileProcessing.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/ZipArchive.gmk b/make/common/ZipArchive.gmk
index 928bff9bd84..22fd6722fa2 100644
--- a/make/common/ZipArchive.gmk
+++ b/make/common/ZipArchive.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/modules/CopyCommon.gmk b/make/common/modules/CopyCommon.gmk
index 75bfb0d62b1..f4df1ce3a30 100644
--- a/make/common/modules/CopyCommon.gmk
+++ b/make/common/modules/CopyCommon.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk
index 77f39457b4c..38485283dcb 100644
--- a/make/common/modules/LauncherCommon.gmk
+++ b/make/common/modules/LauncherCommon.gmk
@@ -160,6 +160,7 @@ define SetupBuildLauncherBody
-framework ApplicationServices \
-framework Cocoa \
-framework Security, \
+ LINK_TYPE := $$($1_LINK_TYPE), \
OUTPUT_DIR := $$($1_OUTPUT_DIR), \
OBJECT_DIR := $$($1_OBJECT_DIR), \
VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
@@ -192,9 +193,7 @@ ifeq ($(call isTargetOsType, unix)+$(MAKEFILE_PREFIX), true+Launcher)
MAN_FILES_MD := $(wildcard $(addsuffix /*.md, $(call FindModuleManDirs, $(MODULE))))
ifneq ($(MAN_FILES_MD), )
- ifeq ($(ENABLE_PANDOC), false)
- $(info Warning: pandoc not found. Not generating man pages)
- else
+ ifeq ($(ENABLE_PANDOC), true)
# Create dynamic man pages from markdown using pandoc. We need
# PANDOC_TROFF_MANPAGE_FILTER, a wrapper around
# PANDOC_TROFF_MANPAGE_FILTER_JAVASCRIPT. This is created by buildtools-jdk.
diff --git a/make/common/native/Flags.gmk b/make/common/native/Flags.gmk
index 213312047a4..daa9a83d62b 100644
--- a/make/common/native/Flags.gmk
+++ b/make/common/native/Flags.gmk
@@ -99,7 +99,7 @@ define SetupCompilerFlags
$1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release)
endif
ifeq ($(STATIC_LIBS), true)
- $1_EXTRA_CFLAGS += $$(STATIC_LIBS_CFLAGS)
+ $1_EXTRA_CFLAGS += -DSTATIC_BUILD=1
endif
# Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS and/or TOOLCHAIN_TYPE
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 8e938c72939..56be91d4ec4 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1201,9 +1201,11 @@ var getJibProfilesDependencies = function (input, common) {
},
jcov: {
- organization: common.organization,
- revision: "3.0-17-jdk-asm+1.0",
- ext: "zip",
+ server: "jpg",
+ product: "jcov",
+ version: "3.0",
+ build_number: "1",
+ file: "bundles/jcov-3.0+1.zip",
environment_name: "JCOV_HOME",
},
diff --git a/make/devkit/Makefile b/make/devkit/Makefile
index 9c498807a54..5ffa5265aa3 100644
--- a/make/devkit/Makefile
+++ b/make/devkit/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/hotspot/CopyToExplodedJdk.gmk b/make/hotspot/CopyToExplodedJdk.gmk
index 280224de19e..21d68c7b06f 100644
--- a/make/hotspot/CopyToExplodedJdk.gmk
+++ b/make/hotspot/CopyToExplodedJdk.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/hotspot/gensrc/GensrcJvmti.gmk b/make/hotspot/gensrc/GensrcJvmti.gmk
index 718766cacae..b9c2e38b820 100644
--- a/make/hotspot/gensrc/GensrcJvmti.gmk
+++ b/make/hotspot/gensrc/GensrcJvmti.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/ide/eclipse/CreateWorkspace.gmk b/make/ide/eclipse/CreateWorkspace.gmk
index 793377ec51e..50d04ad87af 100644
--- a/make/ide/eclipse/CreateWorkspace.gmk
+++ b/make/ide/eclipse/CreateWorkspace.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/ide/idea/jdk/idea.gmk b/make/ide/idea/jdk/idea.gmk
index cc4d0a174cd..b27de609c49 100644
--- a/make/ide/idea/jdk/idea.gmk
+++ b/make/ide/idea/jdk/idea.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java
index 4dd3c898b61..80a2df5bd55 100644
--- a/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java
+++ b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java
index a61afa8461a..36dc782c8e2 100644
--- a/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java
+++ b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/make/ide/vscode/hotspot/CreateVSCodeProject.gmk b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
index 5ceef111086..54c98a3eeb6 100644
--- a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
+++ b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/ide/xcode/hotspot/CreateXcodeProject.gmk b/make/ide/xcode/hotspot/CreateXcodeProject.gmk
index db8f7f401ef..1f92ba0716f 100644
--- a/make/ide/xcode/hotspot/CreateXcodeProject.gmk
+++ b/make/ide/xcode/hotspot/CreateXcodeProject.gmk
@@ -42,7 +42,7 @@ ifeq ($(call isTargetOs, macosx), true)
PROJECT_FILE_NAME := hotspot.xcodeproj
COMPILE_COMMAND_FILE := $(OUTPUTDIR)/compile_commands.json
- LINKER_FLAGS_FILE := $(MAKESUPPORT_OUTPUTDIR)/compile-commands/jvm-ldflags.txt
+ LINKER_FLAGS_FILE := $(MAKESUPPORT_OUTPUTDIR)/compile-commands/LIBRARY_hotspot_variant-server_libjvm_libjvm-ldflags.txt
$(eval $(call SetupJavaCompilation, BUILD_PROJECT_CREATOR, \
TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
@@ -60,7 +60,7 @@ ifeq ($(call isTargetOs, macosx), true)
XCODE_PROJ_DEBUG_OPTION := -d
endif
- XCODE_PROJ_VARDEPS := $(WORKSPACE_ROOT) $(IDE_OUTPUTDIR) \
+ XCODE_PROJ_VARDEPS := $(TOPDIR) $(IDE_OUTPUTDIR) \
$(PROJECT_MAKER_DIR)/data $(COMPILE_COMMAND_FILE) $(LINKER_FLAGS_FILE)
XCODE_PROJ_VARDEPS_FILE := $(call DependOnVariable, XCODE_PROJ_VARDEPS, \
$(TOOLS_OUTPUTDIR)/xcodeproj.vardeps)
@@ -70,7 +70,7 @@ ifeq ($(call isTargetOs, macosx), true)
DEPS := $(BUILD_PROJECT_CREATOR) $(COMPILE_COMMAND_FILE) \
$(LINKER_FLAGS_FILE) $(XCODE_PROJ_VARDEPS_FILE), \
OUTPUT_DIR := $(TOOLS_OUTPUTDIR), \
- COMMAND := $(PROJECT_CREATOR_TOOL) $(WORKSPACE_ROOT) $(IDE_OUTPUTDIR) \
+ COMMAND := $(PROJECT_CREATOR_TOOL) $(TOPDIR) $(IDE_OUTPUTDIR) \
$(PROJECT_MAKER_DIR)/data $(COMPILE_COMMAND_FILE) \
$(LINKER_FLAGS_FILE) $(XCODE_PROJ_DEBUG_OPTION), \
))
diff --git a/make/langtools/tools/javacserver/server/CompilerThreadPool.java b/make/langtools/tools/javacserver/server/CompilerThreadPool.java
index 0a40a27ad87..1f9e3a195b6 100644
--- a/make/langtools/tools/javacserver/server/CompilerThreadPool.java
+++ b/make/langtools/tools/javacserver/server/CompilerThreadPool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/make/langtools/tools/javacserver/server/Server.java b/make/langtools/tools/javacserver/server/Server.java
index 8d8bac76ad7..ac0b740a58b 100644
--- a/make/langtools/tools/javacserver/server/Server.java
+++ b/make/langtools/tools/javacserver/server/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/make/langtools/tools/propertiesparser/parser/MessageType.java b/make/langtools/tools/propertiesparser/parser/MessageType.java
index cba9263567d..ea518dc536b 100644
--- a/make/langtools/tools/propertiesparser/parser/MessageType.java
+++ b/make/langtools/tools/propertiesparser/parser/MessageType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/make/modules/java.base/gensrc/GensrcBuffer.gmk b/make/modules/java.base/gensrc/GensrcBuffer.gmk
index 8255cc62eec..fe417e9c423 100644
--- a/make/modules/java.base/gensrc/GensrcBuffer.gmk
+++ b/make/modules/java.base/gensrc/GensrcBuffer.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/java.base/gensrc/GensrcExceptions.gmk b/make/modules/java.base/gensrc/GensrcExceptions.gmk
index f3509710a37..9fa5d48009b 100644
--- a/make/modules/java.base/gensrc/GensrcExceptions.gmk
+++ b/make/modules/java.base/gensrc/GensrcExceptions.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/java.base/gensrc/GensrcMisc.gmk b/make/modules/java.base/gensrc/GensrcMisc.gmk
index 19d7c6dee9d..a5bbd37321c 100644
--- a/make/modules/java.base/gensrc/GensrcMisc.gmk
+++ b/make/modules/java.base/gensrc/GensrcMisc.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/java.desktop/gensrc/GensrcIcons.gmk b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
index dc1c1794e63..4e572211334 100644
--- a/make/modules/java.desktop/gensrc/GensrcIcons.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.charsets/Java.gmk b/make/modules/jdk.charsets/Java.gmk
index 3adf141e8e1..2eb5bd45456 100644
--- a/make/modules/jdk.charsets/Java.gmk
+++ b/make/modules/jdk.charsets/Java.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.compiler/Gendata.gmk b/make/modules/jdk.compiler/Gendata.gmk
index 78847074c88..57487c7c842 100644
--- a/make/modules/jdk.compiler/Gendata.gmk
+++ b/make/modules/jdk.compiler/Gendata.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.javadoc/Gendata.gmk b/make/modules/jdk.javadoc/Gendata.gmk
index 95719c7b452..d733af65f1e 100644
--- a/make/modules/jdk.javadoc/Gendata.gmk
+++ b/make/modules/jdk.javadoc/Gendata.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.javadoc/Gensrc.gmk b/make/modules/jdk.javadoc/Gensrc.gmk
index 0d25ff61e92..0346e3832df 100644
--- a/make/modules/jdk.javadoc/Gensrc.gmk
+++ b/make/modules/jdk.javadoc/Gensrc.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.jcmd/Java.gmk b/make/modules/jdk.jcmd/Java.gmk
index 2cae8b0fdd5..d19d9beb4d8 100644
--- a/make/modules/jdk.jcmd/Java.gmk
+++ b/make/modules/jdk.jcmd/Java.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.jconsole/Java.gmk b/make/modules/jdk.jconsole/Java.gmk
index b60b84cdc3c..2de9321392d 100644
--- a/make/modules/jdk.jconsole/Java.gmk
+++ b/make/modules/jdk.jconsole/Java.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.jdeps/Gensrc.gmk b/make/modules/jdk.jdeps/Gensrc.gmk
index cb9a27908ce..b5f1e702a75 100644
--- a/make/modules/jdk.jdeps/Gensrc.gmk
+++ b/make/modules/jdk.jdeps/Gensrc.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.localedata/Java.gmk b/make/modules/jdk.localedata/Java.gmk
index cb12bc560b2..41696a641a7 100644
--- a/make/modules/jdk.localedata/Java.gmk
+++ b/make/modules/jdk.localedata/Java.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/modules/jdk.sctp/Java.gmk b/make/modules/jdk.sctp/Java.gmk
index b1fbdcda9f4..cac0f770816 100644
--- a/make/modules/jdk.sctp/Java.gmk
+++ b/make/modules/jdk.sctp/Java.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/test/BuildJtregTestThreadFactory.gmk b/make/test/BuildJtregTestThreadFactory.gmk
index aa9808dd584..4f0ead24ece 100644
--- a/make/test/BuildJtregTestThreadFactory.gmk
+++ b/make/test/BuildJtregTestThreadFactory.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
index 59825d67c98..7cf6713a7bb 100644
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/make/test/JtregNativeLibTest.gmk b/make/test/JtregNativeLibTest.gmk
index 838d37f8145..1a0177e63b0 100644
--- a/make/test/JtregNativeLibTest.gmk
+++ b/make/test/JtregNativeLibTest.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/demo/share/java2d/J2DBench/Makefile b/src/demo/share/java2d/J2DBench/Makefile
index edc4494e131..d9dd6258329 100644
--- a/src/demo/share/java2d/J2DBench/Makefile
+++ b/src/demo/share/java2d/J2DBench/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
diff --git a/src/demo/share/java2d/J2DBench/build.xml b/src/demo/share/java2d/J2DBench/build.xml
index 415c315899e..2942e5fa260 100644
--- a/src/demo/share/java2d/J2DBench/build.xml
+++ b/src/demo/share/java2d/J2DBench/build.xml
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index 0d3a240cecf..d217fb7e949 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -320,6 +320,10 @@ source %{
}
}
+ bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen) {
+ return false;
+ }
+
// Assert that the given node is not a variable shift.
bool assert_not_var_shift(const Node* n) {
assert(!n->as_ShiftV()->is_var_shift(), "illegal variable shift");
@@ -6150,41 +6154,6 @@ instruct vtest_alltrue_sve(rFlagsReg cr, pReg src1, pReg src2, pReg ptmp) %{
ins_pipe(pipe_slow);
%}
-// ------------------------------ Vector shuffle -------------------------------
-
-instruct loadshuffle(vReg dst, vReg src) %{
- match(Set dst (VectorLoadShuffle src));
- format %{ "loadshuffle $dst, $src" %}
- ins_encode %{
- BasicType bt = Matcher::vector_element_basic_type(this);
- uint length_in_bytes = Matcher::vector_length_in_bytes(this);
- if (bt == T_BYTE) {
- if ($dst$$FloatRegister != $src$$FloatRegister) {
- if (VM_Version::use_neon_for_vector(length_in_bytes)) {
- __ orr($dst$$FloatRegister, length_in_bytes == 16 ? __ T16B : __ T8B,
- $src$$FloatRegister, $src$$FloatRegister);
- } else {
- assert(UseSVE > 0, "must be sve");
- __ sve_orr($dst$$FloatRegister, $src$$FloatRegister, $src$$FloatRegister);
- }
- }
- } else {
- if (VM_Version::use_neon_for_vector(length_in_bytes)) {
- // 4S/8S, 4I, 4F
- __ uxtl($dst$$FloatRegister, __ T8H, $src$$FloatRegister, __ T8B);
- if (type2aelembytes(bt) == 4) {
- __ uxtl($dst$$FloatRegister, __ T4S, $dst$$FloatRegister, __ T4H);
- }
- } else {
- assert(UseSVE > 0, "must be sve");
- __ sve_vector_extend($dst$$FloatRegister, __ elemType_to_regVariant(bt),
- $src$$FloatRegister, __ B);
- }
- }
- %}
- ins_pipe(pipe_slow);
-%}
-
// ------------------------------ Vector rearrange -----------------------------
// Here is an example that rearranges a NEON vector with 4 ints:
@@ -6207,6 +6176,7 @@ instruct loadshuffle(vReg dst, vReg src) %{
// need to lookup 2/4 bytes as a group. For VectorRearrange long, we use bsl
// to implement rearrange.
+// Maybe move the shuffle preparation to VectorLoadShuffle
instruct rearrange_HS_neon(vReg dst, vReg src, vReg shuffle, vReg tmp1, vReg tmp2) %{
predicate(UseSVE == 0 &&
(Matcher::vector_element_basic_type(n) == T_SHORT ||
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index 99708e9ef31..422e98d9b68 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -310,6 +310,10 @@ source %{
}
}
+ bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen) {
+ return false;
+ }
+
// Assert that the given node is not a variable shift.
bool assert_not_var_shift(const Node* n) {
assert(!n->as_ShiftV()->is_var_shift(), "illegal variable shift");
@@ -4397,41 +4401,6 @@ instruct vtest_alltrue_sve(rFlagsReg cr, pReg src1, pReg src2, pReg ptmp) %{
ins_pipe(pipe_slow);
%}
-// ------------------------------ Vector shuffle -------------------------------
-
-instruct loadshuffle(vReg dst, vReg src) %{
- match(Set dst (VectorLoadShuffle src));
- format %{ "loadshuffle $dst, $src" %}
- ins_encode %{
- BasicType bt = Matcher::vector_element_basic_type(this);
- uint length_in_bytes = Matcher::vector_length_in_bytes(this);
- if (bt == T_BYTE) {
- if ($dst$$FloatRegister != $src$$FloatRegister) {
- if (VM_Version::use_neon_for_vector(length_in_bytes)) {
- __ orr($dst$$FloatRegister, length_in_bytes == 16 ? __ T16B : __ T8B,
- $src$$FloatRegister, $src$$FloatRegister);
- } else {
- assert(UseSVE > 0, "must be sve");
- __ sve_orr($dst$$FloatRegister, $src$$FloatRegister, $src$$FloatRegister);
- }
- }
- } else {
- if (VM_Version::use_neon_for_vector(length_in_bytes)) {
- // 4S/8S, 4I, 4F
- __ uxtl($dst$$FloatRegister, __ T8H, $src$$FloatRegister, __ T8B);
- if (type2aelembytes(bt) == 4) {
- __ uxtl($dst$$FloatRegister, __ T4S, $dst$$FloatRegister, __ T4H);
- }
- } else {
- assert(UseSVE > 0, "must be sve");
- __ sve_vector_extend($dst$$FloatRegister, __ elemType_to_regVariant(bt),
- $src$$FloatRegister, __ B);
- }
- }
- %}
- ins_pipe(pipe_slow);
-%}
-
// ------------------------------ Vector rearrange -----------------------------
// Here is an example that rearranges a NEON vector with 4 ints:
@@ -4454,6 +4423,7 @@ instruct loadshuffle(vReg dst, vReg src) %{
// need to lookup 2/4 bytes as a group. For VectorRearrange long, we use bsl
// to implement rearrange.
+// Maybe move the shuffle preparation to VectorLoadShuffle
instruct rearrange_HS_neon(vReg dst, vReg src, vReg shuffle, vReg tmp1, vReg tmp2) %{
predicate(UseSVE == 0 &&
(Matcher::vector_element_basic_type(n) == T_SHORT ||
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index f24b3afa095..d0fa74ab66e 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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.
*
diff --git a/src/hotspot/cpu/aarch64/c2_CodeStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_CodeStubs_aarch64.cpp
index 4bd509880f2..90157a5668d 100644
--- a/src/hotspot/cpu/aarch64/c2_CodeStubs_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_CodeStubs_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/aarch64/c2_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp
index e57dab7d1ed..6c5c469ca27 100644
--- a/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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.
*
diff --git a/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp b/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp
index 03ee729b767..b9248b01a09 100644
--- a/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2018, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
index b96241aab19..6ad6e3134bc 100644
--- a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
@@ -24,12 +24,14 @@
*/
#include "precompiled.hpp"
-#include "asm/assembler.hpp"
+#include "asm/macroAssembler.hpp"
#include "logging/log.hpp"
#include "oops/compressedKlass.hpp"
#include "memory/metaspace.hpp"
+#include "runtime/java.hpp"
#include "runtime/os.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/formatBuffer.hpp"
// Helper function; reserve at an address that is compatible with EOR
static char* reserve_at_eor_compatible_address(size_t size, bool aslr) {
@@ -79,6 +81,7 @@ static char* reserve_at_eor_compatible_address(size_t size, bool aslr) {
}
return result;
}
+
char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size_t size, bool aslr, bool optimize_for_zero_base) {
char* result = nullptr;
@@ -117,3 +120,12 @@ char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size
return result;
}
+
+bool CompressedKlassPointers::check_klass_decode_mode(address base, int shift, const size_t range) {
+ return MacroAssembler::check_klass_decode_mode(base, shift, range);
+}
+
+bool CompressedKlassPointers::set_klass_decode_mode() {
+ const size_t range = klass_range_end() - base();
+ return MacroAssembler::set_klass_decode_mode(_base, _shift, range);
+}
diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
index 5614d499beb..4eafc6eeac3 100644
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
index 4baa18cb945..04ac2096096 100644
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/aarch64/gc/z/zAddress_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
index fcec3ae64fd..c656736aa64 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
index 18095632ac0..45ad873ae27 100644
--- a/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 0da971cfdb5..0f7d66be02d 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -5464,32 +5464,47 @@ void MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) {
MacroAssembler::KlassDecodeMode MacroAssembler::_klass_decode_mode(KlassDecodeNone);
MacroAssembler::KlassDecodeMode MacroAssembler::klass_decode_mode() {
- assert(UseCompressedClassPointers, "not using compressed class pointers");
assert(Metaspace::initialized(), "metaspace not initialized yet");
+ assert(_klass_decode_mode != KlassDecodeNone, "should be initialized");
+ return _klass_decode_mode;
+}
- if (_klass_decode_mode != KlassDecodeNone) {
- return _klass_decode_mode;
- }
+MacroAssembler::KlassDecodeMode MacroAssembler::klass_decode_mode(address base, int shift, const size_t range) {
+ assert(UseCompressedClassPointers, "not using compressed class pointers");
+
+ // KlassDecodeMode shouldn't be set already.
+ assert(_klass_decode_mode == KlassDecodeNone, "set once");
- if (CompressedKlassPointers::base() == nullptr) {
- return (_klass_decode_mode = KlassDecodeZero);
+ if (base == nullptr) {
+ return KlassDecodeZero;
}
if (operand_valid_for_logical_immediate(
- /*is32*/false, (uint64_t)CompressedKlassPointers::base())) {
- const size_t range = CompressedKlassPointers::klass_range_end() - CompressedKlassPointers::base();
+ /*is32*/false, (uint64_t)base)) {
const uint64_t range_mask = right_n_bits(log2i_ceil(range));
- if (((uint64_t)CompressedKlassPointers::base() & range_mask) == 0) {
- return (_klass_decode_mode = KlassDecodeXor);
+ if (((uint64_t)base & range_mask) == 0) {
+ return KlassDecodeXor;
}
}
const uint64_t shifted_base =
- (uint64_t)CompressedKlassPointers::base() >> CompressedKlassPointers::shift();
- guarantee((shifted_base & 0xffff0000ffffffff) == 0,
- "compressed class base bad alignment");
+ (uint64_t)base >> shift;
+ if ((shifted_base & 0xffff0000ffffffff) == 0) {
+ return KlassDecodeMovk;
+ }
+
+ // No valid encoding.
+ return KlassDecodeNone;
+}
+
+// Check if one of the above decoding modes will work for given base, shift and range.
+bool MacroAssembler::check_klass_decode_mode(address base, int shift, const size_t range) {
+ return klass_decode_mode(base, shift, range) != KlassDecodeNone;
+}
- return (_klass_decode_mode = KlassDecodeMovk);
+bool MacroAssembler::set_klass_decode_mode(address base, int shift, const size_t range) {
+ _klass_decode_mode = klass_decode_mode(base, shift, range);
+ return _klass_decode_mode != KlassDecodeNone;
}
void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index dcc0de947b5..0083c0f98ed 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -99,11 +99,22 @@ class MacroAssembler: public Assembler {
KlassDecodeMovk
};
- KlassDecodeMode klass_decode_mode();
+ // Calculate decoding mode based on given parameters, used for checking then ultimately setting.
+ static KlassDecodeMode klass_decode_mode(address base, int shift, const size_t range);
private:
static KlassDecodeMode _klass_decode_mode;
+ // Returns above setting with asserts
+ static KlassDecodeMode klass_decode_mode();
+
+ public:
+ // Checks the decode mode and returns false if not compatible with preferred decoding mode.
+ static bool check_klass_decode_mode(address base, int shift, const size_t range);
+
+ // Sets the decode mode and returns false if cannot be set.
+ static bool set_klass_decode_mode(address base, int shift, const size_t range);
+
public:
MacroAssembler(CodeBuffer* code) : Assembler(code) {}
diff --git a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
index 4d28e5ade66..447c5f57a8a 100644
--- a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index 09bb370f210..5358a4e6a1d 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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.
*
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 7177bd4f954..e0bc461498b 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1754,7 +1754,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
- BasicType* in_elem_bt = nullptr;
int argc = 0;
out_sig_bt[argc++] = T_ADDRESS;
@@ -1943,15 +1942,12 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// For JNI natives the incoming and outgoing registers are offset upwards.
GrowableArray<int> arg_order(2 * total_in_args);
- VMRegPair tmp_vmreg;
- tmp_vmreg.set2(r19->as_VMReg());
for (int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0; i--, c_arg--) {
arg_order.push(i);
arg_order.push(c_arg);
}
- int temploc = -1;
for (int ai = 0; ai < arg_order.length(); ai += 2) {
int i = arg_order.at(ai);
int c_arg = arg_order.at(ai + 1);
@@ -2171,7 +2167,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
}
Label safepoint_in_progress, safepoint_in_progress_done;
- Label after_transition;
// Switch thread to "native transition" state before reading the synchronization state.
// This additional state is necessary because reading and testing the synchronization
@@ -2204,7 +2199,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
__ mov(rscratch1, _thread_in_Java);
__ lea(rscratch2, Address(rthread, JavaThread::thread_state_offset()));
__ stlrw(rscratch1, rscratch2);
- __ bind(after_transition);
if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
// Check preemption for Object.wait()
diff --git a/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
index dcba233c9dc..45e8f2f4202 100644
--- a/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/aarch64/upcallLinker_aarch64.cpp b/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
index 517fccb2d1a..a2925f00b05 100644
--- a/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2022, Arm Limited. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
index 88b364e8e74..6d381533917 100644
--- a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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.
*
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index bfca986f350..a3db5c0619c 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -999,6 +999,10 @@ bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
return false;
}
+bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen) {
+ return false;
+}
+
const RegMask* Matcher::predicate_reg_mask(void) {
return nullptr;
}
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
index e53eefac097..ae13644ecf9 100644
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/c2_globals_arm.hpp b/src/hotspot/cpu/arm/c2_globals_arm.hpp
index a44a8f649ae..abd3ef6aef5 100644
--- a/src/hotspot/cpu/arm/c2_globals_arm.hpp
+++ b/src/hotspot/cpu/arm/c2_globals_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/compiledIC_arm.cpp b/src/hotspot/cpu/arm/compiledIC_arm.cpp
index a2c37e2907c..2556a79126a 100644
--- a/src/hotspot/cpu/arm/compiledIC_arm.cpp
+++ b/src/hotspot/cpu/arm/compiledIC_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/continuationFreezeThaw_arm.inline.hpp b/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
index fb588318170..b276a7d70b6 100644
--- a/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/continuationHelper_arm.inline.hpp b/src/hotspot/cpu/arm/continuationHelper_arm.inline.hpp
index 445a013b3e5..4bcff7512e6 100644
--- a/src/hotspot/cpu/arm/continuationHelper_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/continuationHelper_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
index 56ae7707fbf..17ac726ada7 100644
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp
index aefde19142e..4e49e655e3e 100644
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
index c13a259a1b9..521c766bcd0 100644
--- a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp
index 054d172f463..71392f6ef1b 100644
--- a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/globalDefinitions_arm.hpp b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
index 5b68dbc9dbd..2fdfd48b073 100644
--- a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
+++ b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/macroAssembler_arm.cpp b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
index 99d619bddb5..8e7b323e535 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.hpp
index 691c8fa70ee..621f0101432 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/matcher_arm.hpp b/src/hotspot/cpu/arm/matcher_arm.hpp
index 716a997a72b..a4436b7eab4 100644
--- a/src/hotspot/cpu/arm/matcher_arm.hpp
+++ b/src/hotspot/cpu/arm/matcher_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/methodHandles_arm.cpp b/src/hotspot/cpu/arm/methodHandles_arm.cpp
index 7fc984afa99..f59e01112e9 100644
--- a/src/hotspot/cpu/arm/methodHandles_arm.cpp
+++ b/src/hotspot/cpu/arm/methodHandles_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/register_arm.hpp b/src/hotspot/cpu/arm/register_arm.hpp
index d8961fd2935..fca23d07fee 100644
--- a/src/hotspot/cpu/arm/register_arm.hpp
+++ b/src/hotspot/cpu/arm/register_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp
index 6f6c0c17e00..cd76843d6df 100644
--- a/src/hotspot/cpu/arm/runtime_arm.cpp
+++ b/src/hotspot/cpu/arm/runtime_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
index a0cc2f44199..82e16836acb 100644
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/smallRegisterMap_arm.inline.hpp b/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
index 08adbbd89d8..903a71aab53 100644
--- a/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/templateInterpreterGenerator_arm.cpp b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
index 61f6026dbe3..9df7a455eeb 100644
--- a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/arm/vtableStubs_arm.cpp b/src/hotspot/cpu/arm/vtableStubs_arm.cpp
index 1229b5073f5..8f453558848 100644
--- a/src/hotspot/cpu/arm/vtableStubs_arm.cpp
+++ b/src/hotspot/cpu/arm/vtableStubs_arm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
index b99235371aa..68a0c78e7cf 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -39,18 +39,10 @@ class Address {
intptr_t _disp; // Displacement.
public:
- Address(Register b, Register i, address d = 0)
- : _base(b), _index(i), _disp((intptr_t)d) {
- assert(i == noreg || d == 0, "can't have both");
- }
-
- Address(Register b, address d = 0)
- : _base(b), _index(noreg), _disp((intptr_t)d) {}
-
Address(Register b, ByteSize d)
: _base(b), _index(noreg), _disp((intptr_t)d) {}
- Address(Register b, intptr_t d)
+ Address(Register b, intptr_t d = 0)
: _base(b), _index(noreg), _disp(d) {}
Address(Register b, RegisterOrConstant roc)
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
index 82d9a046bc6..d7f2aefd9c4 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/ppc/c2_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
index 48a362aa63c..345d5a6350d 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/ppc/c2_globals_ppc.hpp b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
index f45faa21f01..3e83ac4f3a4 100644
--- a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/c2_init_ppc.cpp b/src/hotspot/cpu/ppc/c2_init_ppc.cpp
index e517cdf7de1..a02b9668c92 100644
--- a/src/hotspot/cpu/ppc/c2_init_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_init_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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.
*
diff --git a/src/hotspot/cpu/ppc/compiledIC_ppc.cpp b/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
index 0780837e8e5..a7907b43c4b 100644
--- a/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
+++ b/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp b/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
index e49bc548ad4..8eb33c3cd0b 100644
--- a/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/ppc/continuationHelper_ppc.inline.hpp b/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
index ae5a02451e2..d55bf0da3e3 100644
--- a/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/ppc/frame_ppc.cpp b/src/hotspot/cpu/ppc/frame_ppc.cpp
index 935def11e1a..07243ed1c8c 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.cpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.cpp
@@ -287,7 +287,7 @@ void frame::patch_pc(Thread* thread, address pc) {
p2i(&((address*) _sp)[-1]), p2i(((address*) _sp)[-1]), p2i(pc));
}
assert(!Continuation::is_return_barrier_entry(*pc_addr), "return barrier");
- assert(_pc == *pc_addr || pc == *pc_addr || 0 == *pc_addr,
+ assert(_pc == *pc_addr || pc == *pc_addr || nullptr == *pc_addr,
"must be (pc: " INTPTR_FORMAT " _pc: " INTPTR_FORMAT " pc_addr: " INTPTR_FORMAT
" *pc_addr: " INTPTR_FORMAT " sp: " INTPTR_FORMAT ")",
p2i(pc), p2i(_pc), p2i(pc_addr), p2i(*pc_addr), p2i(sp()));
@@ -318,10 +318,10 @@ void frame::patch_pc(Thread* thread, address pc) {
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
assert(is_interpreted_frame(), "Not an interpreted frame");
// These are reasonable sanity checks
- if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
+ if (fp() == nullptr || (intptr_t(fp()) & (wordSize-1)) != 0) {
return false;
}
- if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
+ if (sp() == nullptr || (intptr_t(sp()) & (wordSize-1)) != 0) {
return false;
}
int min_frame_slots = (parent_ijava_frame_abi_size + ijava_state_size) / sizeof(intptr_t);
diff --git a/src/hotspot/cpu/ppc/frame_ppc.hpp b/src/hotspot/cpu/ppc/frame_ppc.hpp
index 0e0c1a388bf..67456158b97 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp
index 1c9fe8a5d10..33cb89dacc6 100644
--- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2021 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
index 9c1cef5eea4..f48b1bc5f66 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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.
*
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
index 796c32a58df..9ce0b7c8eb4 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
@@ -624,7 +624,7 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler *masm, DecoratorSet
tmp1, tmp2, tmp3,
preservation_level);
- // No need for post barrier if storing NULL
+ // No need for post barrier if storing null
if (ShenandoahCardBarrier && is_reference_type(type) && val != noreg) {
store_check(masm, base, ind_or_offs, tmp1);
}
diff --git a/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp b/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
index ddeb9adf0a9..5891d50f715 100644
--- a/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
index fcfc0f91533..27203e7b01c 100644
--- a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2022 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/gc/z/z_ppc.ad b/src/hotspot/cpu/ppc/gc/z/z_ppc.ad
index 97b49bc1b02..5205138a6ee 100644
--- a/src/hotspot/cpu/ppc/gc/z/z_ppc.ad
+++ b/src/hotspot/cpu/ppc/gc/z/z_ppc.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2021, 2024, 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.
//
diff --git a/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp
index 30670d053fa..f8f15741301 100644
--- a/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp
+++ b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
index 4c39f88ce51..7277ac3bc1a 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 511f0f2e96c..971ed99f9eb 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -3296,7 +3296,7 @@ void MacroAssembler::get_vm_result_2(Register metadata_result) {
Register MacroAssembler::encode_klass_not_null(Register dst, Register src) {
Register current = (src != noreg) ? src : dst; // Klass is in dst if no src provided.
- if (CompressedKlassPointers::base() != 0) {
+ if (CompressedKlassPointers::base() != nullptr) {
// Use dst as temp if it is free.
sub_const_optimized(dst, current, CompressedKlassPointers::base(), R0);
current = dst;
@@ -3356,11 +3356,11 @@ void MacroAssembler::decode_klass_not_null(Register dst, Register src) {
if (src == noreg) src = dst;
Register shifted_src = src;
if (CompressedKlassPointers::shift() != 0 ||
- (CompressedKlassPointers::base() == 0 && src != dst)) { // Move required.
+ (CompressedKlassPointers::base() == nullptr && src != dst)) { // Move required.
shifted_src = dst;
sldi(shifted_src, src, CompressedKlassPointers::shift());
}
- if (CompressedKlassPointers::base() != 0) {
+ if (CompressedKlassPointers::base() != nullptr) {
add_const_optimized(dst, shifted_src, CompressedKlassPointers::base(), R0);
}
}
diff --git a/src/hotspot/cpu/ppc/matcher_ppc.hpp b/src/hotspot/cpu/ppc/matcher_ppc.hpp
index 0ee4245f274..aaac79325c4 100644
--- a/src/hotspot/cpu/ppc/matcher_ppc.hpp
+++ b/src/hotspot/cpu/ppc/matcher_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/ppc/nativeInst_ppc.cpp b/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
index dbc43c45e09..7577bdb9fdd 100644
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.cpp
@@ -56,7 +56,7 @@ bool NativeInstruction::is_sigill_not_entrant_at(address addr) {
void NativeInstruction::verify() {
// Make sure code pattern is actually an instruction address.
address addr = addr_at(0);
- if (addr == 0 || ((intptr_t)addr & 3) != 0) {
+ if (addr == nullptr || ((intptr_t)addr & 3) != 0) {
fatal("not an instruction address");
}
}
@@ -115,7 +115,7 @@ void NativeCall::set_destination_mt_safe(address dest, bool assert_lock) {
// does not provide this information. The branch will be patched
// later during a final fixup, when all necessary information is
// available.
- if (trampoline_stub_addr == 0)
+ if (trampoline_stub_addr == nullptr)
return;
// Patch the constant in the call's trampoline stub.
diff --git a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
index f21d76f8a67..29b8b1b891b 100644
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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.
*
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 549ae0740e2..b023ccae86d 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2153,6 +2153,10 @@ bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
return false;
}
+bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen) {
+ return false;
+}
+
const RegMask* Matcher::predicate_reg_mask(void) {
return nullptr;
}
@@ -3338,7 +3342,7 @@ encode %{
// The trampoline stub.
// No entry point given, use the current pc.
// Make sure branch fits into
- if (entry_point == 0) entry_point = __ pc();
+ if (entry_point == nullptr) entry_point = __ pc();
// Put the entry point as a constant into the constant pool.
const address entry_point_toc_addr = __ address_constant(entry_point, RelocationHolder::none);
@@ -3377,7 +3381,7 @@ encode %{
enc_class enc_java_dynamic_call_sched(method meth) %{
if (!ra_->C->output()->in_scratch_emit_size()) {
// Create a call trampoline stub for the given method.
- const address entry_point = !($meth$$method) ? 0 : (address)$meth$$method;
+ const address entry_point = !($meth$$method) ? nullptr : (address)$meth$$method;
const address entry_point_const = __ address_constant(entry_point, RelocationHolder::none);
if (entry_point_const == nullptr) {
ciEnv::current()->record_out_of_memory_failure();
@@ -3610,7 +3614,7 @@ encode %{
MachNode *mtctr = new CallLeafDirect_mtctrNode();
assert(loadConLNodes_Entry._last != nullptr, "entry must exist");
- mtctr->add_req(0, loadConLNodes_Entry._last);
+ mtctr->add_req(nullptr, loadConLNodes_Entry._last);
mtctr->_opnds[0] = new iRegLdstOper();
mtctr->_opnds[1] = new iRegLdstOper();
diff --git a/src/hotspot/cpu/ppc/register_ppc.hpp b/src/hotspot/cpu/ppc/register_ppc.hpp
index b7ba4f053b5..1a7f4969347 100644
--- a/src/hotspot/cpu/ppc/register_ppc.hpp
+++ b/src/hotspot/cpu/ppc/register_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/relocInfo_ppc.cpp b/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
index 5d0d2785bf4..c0fe87a1e13 100644
--- a/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
+++ b/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
@@ -94,7 +94,6 @@ void Relocation::pd_set_call_destination(address x) {
address* Relocation::pd_address_in_code() {
ShouldNotReachHere();
- return 0;
}
address Relocation::pd_get_address_from_code() {
diff --git a/src/hotspot/cpu/ppc/runtime_ppc.cpp b/src/hotspot/cpu/ppc/runtime_ppc.cpp
index dbdc16ee5f1..eceebc45c94 100644
--- a/src/hotspot/cpu/ppc/runtime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/runtime_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index aedded83623..c2e4c2e9b55 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -2103,7 +2103,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
BasicType *out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
VMRegPair *out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
- BasicType* in_elem_bt = nullptr;
// Create the signature for the C call:
// 1) add the JNIEnv*
diff --git a/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp b/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
index a6246cd7e74..fd352a53716 100644
--- a/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 00d2e206bf9..f1168b5d07b 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -622,7 +622,7 @@ class StubGenerator: public StubCodeGenerator {
// Don't generate, rather use C++ code.
address generate_verify_oop() {
// this is actually a `FunctionDescriptor*'.
- address start = 0;
+ address start = nullptr;
#if !defined(PRODUCT)
start = CAST_FROM_FN_PTR(address, verify_oop_helper);
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 0e88b2d3eb4..43e78dd9d15 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -2615,7 +2615,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
address pc_before_fence = __ pc();
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
assert(__ pc() - pc_before_fence == (ptrdiff_t)BytesPerInstWord, "must be single instruction");
- assert(branch_table[vtos] == 0, "can't compute twice");
+ assert(branch_table[vtos] == nullptr, "can't compute twice");
branch_table[vtos] = __ pc(); // non-volatile_entry point
__ stop("vtos unexpected");
#endif
@@ -2623,7 +2623,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Ldtos);
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[dtos] == 0, "can't compute twice");
+ assert(branch_table[dtos] == nullptr, "can't compute twice");
branch_table[dtos] = __ pc(); // non-volatile_entry point
__ lfdx(F15_ftos, Rclass_or_obj, Roffset);
__ push(dtos);
@@ -2644,7 +2644,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Lftos);
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[ftos] == 0, "can't compute twice");
+ assert(branch_table[ftos] == nullptr, "can't compute twice");
branch_table[ftos] = __ pc(); // non-volatile_entry point
__ lfsx(F15_ftos, Rclass_or_obj, Roffset);
__ push(ftos);
@@ -2665,7 +2665,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Litos);
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[itos] == 0, "can't compute twice");
+ assert(branch_table[itos] == nullptr, "can't compute twice");
branch_table[itos] = __ pc(); // non-volatile_entry point
__ lwax(R17_tos, Rclass_or_obj, Roffset);
__ push(itos);
@@ -2678,7 +2678,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Lltos);
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[ltos] == 0, "can't compute twice");
+ assert(branch_table[ltos] == nullptr, "can't compute twice");
branch_table[ltos] = __ pc(); // non-volatile_entry point
__ ldx(R17_tos, Rclass_or_obj, Roffset);
__ push(ltos);
@@ -2691,7 +2691,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Lbtos);
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[btos] == 0, "can't compute twice");
+ assert(branch_table[btos] == nullptr, "can't compute twice");
branch_table[btos] = __ pc(); // non-volatile_entry point
__ lbzx(R17_tos, Rclass_or_obj, Roffset);
__ extsb(R17_tos, R17_tos);
@@ -2705,7 +2705,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Lztos); (same code as btos)
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[ztos] == 0, "can't compute twice");
+ assert(branch_table[ztos] == nullptr, "can't compute twice");
branch_table[ztos] = __ pc(); // non-volatile_entry point
__ lbzx(R17_tos, Rclass_or_obj, Roffset);
__ push(ztos);
@@ -2719,7 +2719,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Lctos);
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[ctos] == 0, "can't compute twice");
+ assert(branch_table[ctos] == nullptr, "can't compute twice");
branch_table[ctos] = __ pc(); // non-volatile_entry point
__ lhzx(R17_tos, Rclass_or_obj, Roffset);
__ push(ctos);
@@ -2732,7 +2732,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Lstos);
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[stos] == 0, "can't compute twice");
+ assert(branch_table[stos] == nullptr, "can't compute twice");
branch_table[stos] = __ pc(); // non-volatile_entry point
__ lhax(R17_tos, Rclass_or_obj, Roffset);
__ push(stos);
@@ -2745,7 +2745,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align load.
// __ bind(Latos);
__ fence(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[atos] == 0, "can't compute twice");
+ assert(branch_table[atos] == nullptr, "can't compute twice");
branch_table[atos] = __ pc(); // non-volatile_entry point
do_oop_load(_masm, Rclass_or_obj, Roffset, R17_tos, Rscratch, /* nv temp */ Rflags, IN_HEAP);
__ verify_oop(R17_tos);
@@ -2932,7 +2932,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
address pc_before_release = __ pc();
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
assert(__ pc() - pc_before_release == (ptrdiff_t)BytesPerInstWord, "must be single instruction");
- assert(branch_table[vtos] == 0, "can't compute twice");
+ assert(branch_table[vtos] == nullptr, "can't compute twice");
branch_table[vtos] = __ pc(); // non-volatile_entry point
__ stop("vtos unexpected");
#endif
@@ -2940,7 +2940,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Ldtos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[dtos] == 0, "can't compute twice");
+ assert(branch_table[dtos] == nullptr, "can't compute twice");
branch_table[dtos] = __ pc(); // non-volatile_entry point
__ pop(dtos);
if (!is_static) {
@@ -2958,7 +2958,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Lftos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[ftos] == 0, "can't compute twice");
+ assert(branch_table[ftos] == nullptr, "can't compute twice");
branch_table[ftos] = __ pc(); // non-volatile_entry point
__ pop(ftos);
if (!is_static) { pop_and_check_object(Rclass_or_obj); } // Kills R11_scratch1.
@@ -2974,7 +2974,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Litos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[itos] == 0, "can't compute twice");
+ assert(branch_table[itos] == nullptr, "can't compute twice");
branch_table[itos] = __ pc(); // non-volatile_entry point
__ pop(itos);
if (!is_static) { pop_and_check_object(Rclass_or_obj); } // Kills R11_scratch1.
@@ -2990,7 +2990,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Lltos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[ltos] == 0, "can't compute twice");
+ assert(branch_table[ltos] == nullptr, "can't compute twice");
branch_table[ltos] = __ pc(); // non-volatile_entry point
__ pop(ltos);
if (!is_static) { pop_and_check_object(Rclass_or_obj); } // Kills R11_scratch1.
@@ -3006,7 +3006,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Lbtos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[btos] == 0, "can't compute twice");
+ assert(branch_table[btos] == nullptr, "can't compute twice");
branch_table[btos] = __ pc(); // non-volatile_entry point
__ pop(btos);
if (!is_static) { pop_and_check_object(Rclass_or_obj); } // Kills R11_scratch1.
@@ -3022,7 +3022,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Lztos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[ztos] == 0, "can't compute twice");
+ assert(branch_table[ztos] == nullptr, "can't compute twice");
branch_table[ztos] = __ pc(); // non-volatile_entry point
__ pop(ztos);
if (!is_static) { pop_and_check_object(Rclass_or_obj); } // Kills R11_scratch1.
@@ -3039,7 +3039,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Lctos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[ctos] == 0, "can't compute twice");
+ assert(branch_table[ctos] == nullptr, "can't compute twice");
branch_table[ctos] = __ pc(); // non-volatile_entry point
__ pop(ctos);
if (!is_static) { pop_and_check_object(Rclass_or_obj); } // Kills R11_scratch1..
@@ -3055,7 +3055,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Lstos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[stos] == 0, "can't compute twice");
+ assert(branch_table[stos] == nullptr, "can't compute twice");
branch_table[stos] = __ pc(); // non-volatile_entry point
__ pop(stos);
if (!is_static) { pop_and_check_object(Rclass_or_obj); } // Kills R11_scratch1.
@@ -3071,7 +3071,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
__ align(32, 28, 28); // Align pop.
// __ bind(Latos);
__ release(); // Volatile entry point (one instruction before non-volatile_entry point).
- assert(branch_table[atos] == 0, "can't compute twice");
+ assert(branch_table[atos] == nullptr, "can't compute twice");
branch_table[atos] = __ pc(); // non-volatile_entry point
__ pop(atos);
if (!is_static) { pop_and_check_object(Rclass_or_obj); } // kills R11_scratch1
diff --git a/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp b/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
index 635bab900d1..40da31fa209 100644
--- a/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
+++ b/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 37e15548b4f..a09d718287f 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, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -423,7 +423,7 @@ void VM_Version::check_virtualizations() {
while (fgets(line, sizeof(line), fp) != nullptr) {
if (strncmp(line, system_type, strlen(system_type)) == 0) {
- if (strstr(line, "qemu") != 0) {
+ if (strstr(line, "qemu") != nullptr) {
Abstract_VM_Version::_detected_virtualization = PowerKVM;
fclose(fp);
return;
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
index 25dd07c9668..4c0954ebdd2 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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.
*
diff --git a/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp b/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp
index 1e6f748dec8..6a8c146aa9a 100644
--- a/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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.
*
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
index 22f1d694b92..e4efb2c171d 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/c2_CodeStubs_riscv.cpp b/src/hotspot/cpu/riscv/c2_CodeStubs_riscv.cpp
index 682a8622096..6ed6a197921 100644
--- a/src/hotspot/cpu/riscv/c2_CodeStubs_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_CodeStubs_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index a8eb0df419c..114ad0a101c 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/c2_globals_riscv.hpp b/src/hotspot/cpu/riscv/c2_globals_riscv.hpp
index e9947f9888a..de3c1b17c8e 100644
--- a/src/hotspot/cpu/riscv/c2_globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_globals_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
index 0d90c7d866e..a864d7073dc 100644
--- a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
+++ b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
index c95521a95bd..65f3aa263aa 100644
--- a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
+++ b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2018, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/compressedKlass_riscv.cpp b/src/hotspot/cpu/riscv/compressedKlass_riscv.cpp
index 7c8d6b8f5bb..7e596e0a7e9 100644
--- a/src/hotspot/cpu/riscv/compressedKlass_riscv.cpp
+++ b/src/hotspot/cpu/riscv/compressedKlass_riscv.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2023, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp b/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
index 283334bbf41..78975b8df89 100644
--- a/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/riscv/continuationHelper_riscv.inline.hpp b/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
index 8c0fb728dc7..424d56edf5a 100644
--- a/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/riscv/downcallLinker_riscv.cpp b/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
index 26845986a81..97b168a9811 100644
--- a/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
+++ b/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
index 5493882be72..6a3e4f95b98 100644
--- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2024, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
index c7bee2ef6f3..26310231362 100644
--- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2024, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
index c1f51d768df..7061dca738c 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp b/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
index df111723d56..715f0d8aff7 100644
--- a/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
index dde2f1f131f..0b093838b8b 100644
--- a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
index ef7d1c41e0e..190d81acd0c 100644
--- a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/gc/z/z_riscv.ad b/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
index 8e33d514f46..fd9a1d43afc 100644
--- a/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
+++ b/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
diff --git a/src/hotspot/cpu/riscv/globalDefinitions_riscv.hpp b/src/hotspot/cpu/riscv/globalDefinitions_riscv.hpp
index 68cd51ece5f..407017ee1c0 100644
--- a/src/hotspot/cpu/riscv/globalDefinitions_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globalDefinitions_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index 6772fae50ca..806cca16269 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -115,6 +115,7 @@ define_pd_global(intx, InlineSmallCode, 1000);
"Use Zihintpause instructions") \
product(bool, UseZtso, false, EXPERIMENTAL, "Assume Ztso memory model") \
product(bool, UseZvbb, false, EXPERIMENTAL, "Use Zvbb instructions") \
+ product(bool, UseZvbc, false, EXPERIMENTAL, "Use Zvbc instructions") \
product(bool, UseZvfh, false, DIAGNOSTIC, "Use Zvfh instructions") \
product(bool, UseZvkn, false, EXPERIMENTAL, \
"Use Zvkn group extension, Zvkned, Zvknhb, Zvkb, Zvkt") \
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
index ddc0a94a6e4..f52f6ebc11e 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/interpreterRT_riscv.cpp b/src/hotspot/cpu/riscv/interpreterRT_riscv.cpp
index 0191b83ac30..de34d84fecb 100644
--- a/src/hotspot/cpu/riscv/interpreterRT_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interpreterRT_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp b/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
index a366ef6171d..1c06d0b29aa 100644
--- a/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
+++ b/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 44b806834f9..17289891ccd 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -785,7 +785,7 @@ void MacroAssembler::emit_static_call_stub() {
// Jump to the entry point of the c2i stub.
int32_t offset = 0;
- movptr(t1, 0, offset, t0); // lui + lui + slli + add
+ movptr2(t1, 0, offset, t0); // lui + lui + slli + add
jr(t1, offset);
}
@@ -1712,6 +1712,359 @@ void MacroAssembler::vector_update_crc32(Register crc, Register buf, Register le
addi(buf, buf, N*4);
}
}
+
+void MacroAssembler::crc32_vclmul_fold_16_bytes_vectorsize_16(VectorRegister vx, VectorRegister vt,
+ VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3, VectorRegister vtmp4,
+ Register buf, Register tmp, const int STEP) {
+ assert_different_registers(vx, vt, vtmp1, vtmp2, vtmp3, vtmp4);
+ vclmul_vv(vtmp1, vx, vt);
+ vclmulh_vv(vtmp2, vx, vt);
+ vle64_v(vtmp4, buf); addi(buf, buf, STEP);
+ // low parts
+ vredxor_vs(vtmp3, vtmp1, vtmp4);
+ // high parts
+ vslidedown_vi(vx, vtmp4, 1);
+ vredxor_vs(vtmp1, vtmp2, vx);
+ // merge low and high back
+ vslideup_vi(vx, vtmp1, 1);
+ vmv_x_s(tmp, vtmp3);
+ vmv_s_x(vx, tmp);
+}
+
+void MacroAssembler::crc32_vclmul_fold_16_bytes_vectorsize_16_2(VectorRegister vx, VectorRegister vy, VectorRegister vt,
+ VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3, VectorRegister vtmp4,
+ Register tmp) {
+ assert_different_registers(vx, vy, vt, vtmp1, vtmp2, vtmp3, vtmp4);
+ vclmul_vv(vtmp1, vx, vt);
+ vclmulh_vv(vtmp2, vx, vt);
+ // low parts
+ vredxor_vs(vtmp3, vtmp1, vy);
+ // high parts
+ vslidedown_vi(vtmp4, vy, 1);
+ vredxor_vs(vtmp1, vtmp2, vtmp4);
+ // merge low and high back
+ vslideup_vi(vx, vtmp1, 1);
+ vmv_x_s(tmp, vtmp3);
+ vmv_s_x(vx, tmp);
+}
+
+void MacroAssembler::crc32_vclmul_fold_16_bytes_vectorsize_16_3(VectorRegister vx, VectorRegister vy, VectorRegister vt,
+ VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3, VectorRegister vtmp4,
+ Register tmp) {
+ assert_different_registers(vx, vy, vt, vtmp1, vtmp2, vtmp3, vtmp4);
+ vclmul_vv(vtmp1, vx, vt);
+ vclmulh_vv(vtmp2, vx, vt);
+ // low parts
+ vredxor_vs(vtmp3, vtmp1, vy);
+ // high parts
+ vslidedown_vi(vtmp4, vy, 1);
+ vredxor_vs(vtmp1, vtmp2, vtmp4);
+ // merge low and high back
+ vslideup_vi(vy, vtmp1, 1);
+ vmv_x_s(tmp, vtmp3);
+ vmv_s_x(vy, tmp);
+}
+
+void MacroAssembler::kernel_crc32_vclmul_fold_vectorsize_16(Register crc, Register buf, Register len,
+ Register vclmul_table, Register tmp1, Register tmp2) {
+ assert_different_registers(crc, buf, len, vclmul_table, tmp1, tmp2, t1);
+ assert(MaxVectorSize == 16, "sanity");
+
+ const int TABLE_STEP = 16;
+ const int STEP = 16;
+ const int LOOP_STEP = 128;
+ const int N = 2;
+
+ Register loop_step = t1;
+
+ // ======== preparation ========
+
+ mv(loop_step, LOOP_STEP);
+ sub(len, len, loop_step);
+
+ vsetivli(zr, N, Assembler::e64, Assembler::m1, Assembler::mu, Assembler::tu);
+ vle64_v(v0, buf); addi(buf, buf, STEP);
+ vle64_v(v1, buf); addi(buf, buf, STEP);
+ vle64_v(v2, buf); addi(buf, buf, STEP);
+ vle64_v(v3, buf); addi(buf, buf, STEP);
+ vle64_v(v4, buf); addi(buf, buf, STEP);
+ vle64_v(v5, buf); addi(buf, buf, STEP);
+ vle64_v(v6, buf); addi(buf, buf, STEP);
+ vle64_v(v7, buf); addi(buf, buf, STEP);
+
+ vmv_v_x(v31, zr);
+ vsetivli(zr, 1, Assembler::e32, Assembler::m1, Assembler::mu, Assembler::tu);
+ vmv_s_x(v31, crc);
+ vsetivli(zr, N, Assembler::e64, Assembler::m1, Assembler::mu, Assembler::tu);
+ vxor_vv(v0, v0, v31);
+
+ // load table
+ vle64_v(v31, vclmul_table);
+
+ Label L_16_bytes_loop;
+ j(L_16_bytes_loop);
+
+
+ // ======== folding 128 bytes in data buffer per round ========
+
+ align(OptoLoopAlignment);
+ bind(L_16_bytes_loop);
+ {
+ crc32_vclmul_fold_16_bytes_vectorsize_16(v0, v31, v8, v9, v10, v11, buf, tmp2, STEP);
+ crc32_vclmul_fold_16_bytes_vectorsize_16(v1, v31, v12, v13, v14, v15, buf, tmp2, STEP);
+ crc32_vclmul_fold_16_bytes_vectorsize_16(v2, v31, v16, v17, v18, v19, buf, tmp2, STEP);
+ crc32_vclmul_fold_16_bytes_vectorsize_16(v3, v31, v20, v21, v22, v23, buf, tmp2, STEP);
+ crc32_vclmul_fold_16_bytes_vectorsize_16(v4, v31, v24, v25, v26, v27, buf, tmp2, STEP);
+ crc32_vclmul_fold_16_bytes_vectorsize_16(v5, v31, v8, v9, v10, v11, buf, tmp2, STEP);
+ crc32_vclmul_fold_16_bytes_vectorsize_16(v6, v31, v12, v13, v14, v15, buf, tmp2, STEP);
+ crc32_vclmul_fold_16_bytes_vectorsize_16(v7, v31, v16, v17, v18, v19, buf, tmp2, STEP);
+ }
+ sub(len, len, loop_step);
+ bge(len, loop_step, L_16_bytes_loop);
+
+
+ // ======== folding into 64 bytes from 128 bytes in register ========
+
+ // load table
+ addi(vclmul_table, vclmul_table, TABLE_STEP);
+ vle64_v(v31, vclmul_table);
+
+ crc32_vclmul_fold_16_bytes_vectorsize_16_2(v0, v4, v31, v8, v9, v10, v11, tmp2);
+ crc32_vclmul_fold_16_bytes_vectorsize_16_2(v1, v5, v31, v12, v13, v14, v15, tmp2);
+ crc32_vclmul_fold_16_bytes_vectorsize_16_2(v2, v6, v31, v16, v17, v18, v19, tmp2);
+ crc32_vclmul_fold_16_bytes_vectorsize_16_2(v3, v7, v31, v20, v21, v22, v23, tmp2);
+
+
+ // ======== folding into 16 bytes from 64 bytes in register ========
+
+ addi(vclmul_table, vclmul_table, TABLE_STEP);
+ vle64_v(v31, vclmul_table);
+ crc32_vclmul_fold_16_bytes_vectorsize_16_3(v0, v3, v31, v8, v9, v10, v11, tmp2);
+
+ addi(vclmul_table, vclmul_table, TABLE_STEP);
+ vle64_v(v31, vclmul_table);
+ crc32_vclmul_fold_16_bytes_vectorsize_16_3(v1, v3, v31, v12, v13, v14, v15, tmp2);
+
+ addi(vclmul_table, vclmul_table, TABLE_STEP);
+ vle64_v(v31, vclmul_table);
+ crc32_vclmul_fold_16_bytes_vectorsize_16_3(v2, v3, v31, v16, v17, v18, v19, tmp2);
+
+ #undef FOLD_2_VCLMUL_3
+
+
+ // ======== final: move result to scalar regsiters ========
+
+ vmv_x_s(tmp1, v3);
+ vslidedown_vi(v1, v3, 1);
+ vmv_x_s(tmp2, v1);
+}
+
+void MacroAssembler::crc32_vclmul_fold_to_16_bytes_vectorsize_32(VectorRegister vx, VectorRegister vy, VectorRegister vt,
+ VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3, VectorRegister vtmp4) {
+ assert_different_registers(vx, vy, vt, vtmp1, vtmp2, vtmp3, vtmp4);
+ vclmul_vv(vtmp1, vx, vt);
+ vclmulh_vv(vtmp2, vx, vt);
+ // low parts
+ vredxor_vs(vtmp3, vtmp1, vy);
+ // high parts
+ vslidedown_vi(vtmp4, vy, 1);
+ vredxor_vs(vtmp1, vtmp2, vtmp4);
+ // merge low and high back
+ vslideup_vi(vy, vtmp1, 1);
+ vmv_x_s(t1, vtmp3);
+ vmv_s_x(vy, t1);
+}
+
+void MacroAssembler::kernel_crc32_vclmul_fold_vectorsize_32(Register crc, Register buf, Register len,
+ Register vclmul_table, Register tmp1, Register tmp2) {
+ assert_different_registers(crc, buf, len, vclmul_table, tmp1, tmp2, t1);
+ assert(MaxVectorSize >= 32, "sanity");
+
+ // utility: load table
+ #define CRC32_VCLMUL_LOAD_TABLE(vt, rt, vtmp, rtmp) \
+ vid_v(vtmp); \
+ mv(rtmp, 2); \
+ vremu_vx(vtmp, vtmp, rtmp); \
+ vsll_vi(vtmp, vtmp, 3); \
+ vluxei64_v(vt, rt, vtmp);
+
+ const int TABLE_STEP = 16;
+ const int STEP = 128; // 128 bytes per round
+ const int N = 2 * 8; // 2: 128-bits/64-bits, 8: 8 pairs of double 64-bits
+
+ Register step = tmp2;
+
+
+ // ======== preparation ========
+
+ mv(step, STEP);
+ sub(len, len, step); // 2 rounds of folding with carry-less multiplication
+
+ vsetivli(zr, N, Assembler::e64, Assembler::m4, Assembler::mu, Assembler::tu);
+ // load data
+ vle64_v(v4, buf);
+ add(buf, buf, step);
+
+ // load table
+ CRC32_VCLMUL_LOAD_TABLE(v8, vclmul_table, v28, t1);
+ // load mask,
+ // v28 should already contains: 0, 8, 0, 8, ...
+ vmseq_vi(v2, v28, 0);
+ // now, v2 should contains: 101010...
+ vmnand_mm(v1, v2, v2);
+ // now, v1 should contains: 010101...
+
+ // initial crc
+ vmv_v_x(v24, zr);
+ vsetivli(zr, 1, Assembler::e32, Assembler::m4, Assembler::mu, Assembler::tu);
+ vmv_s_x(v24, crc);
+ vsetivli(zr, N, Assembler::e64, Assembler::m4, Assembler::mu, Assembler::tu);
+ vxor_vv(v4, v4, v24);
+
+ Label L_128_bytes_loop;
+ j(L_128_bytes_loop);
+
+
+ // ======== folding 128 bytes in data buffer per round ========
+
+ align(OptoLoopAlignment);
+ bind(L_128_bytes_loop);
+ {
+ // v4: data
+ // v4: buf, reused
+ // v8: table
+ // v12: lows
+ // v16: highs
+ // v20: low_slides
+ // v24: high_slides
+ vclmul_vv(v12, v4, v8);
+ vclmulh_vv(v16, v4, v8);
+ vle64_v(v4, buf);
+ add(buf, buf, step);
+ // lows
+ vslidedown_vi(v20, v12, 1);
+ vmand_mm(v0, v2, v2);
+ vxor_vv(v12, v12, v20, v0_t);
+ // with buf data
+ vxor_vv(v4, v4, v12, v0_t);
+
+ // highs
+ vslideup_vi(v24, v16, 1);
+ vmand_mm(v0, v1, v1);
+ vxor_vv(v16, v16, v24, v0_t);
+ // with buf data
+ vxor_vv(v4, v4, v16, v0_t);
+ }
+ sub(len, len, step);
+ bge(len, step, L_128_bytes_loop);
+
+
+ // ======== folding into 64 bytes from 128 bytes in register ========
+
+ // load table
+ addi(vclmul_table, vclmul_table, TABLE_STEP);
+ CRC32_VCLMUL_LOAD_TABLE(v8, vclmul_table, v28, t1);
+
+ // v4: data, first (low) part, N/2 of 64-bits
+ // v20: data, second (high) part, N/2 of 64-bits
+ // v8: table
+ // v10: lows
+ // v12: highs
+ // v14: low_slides
+ // v16: high_slides
+
+ // high part
+ vslidedown_vi(v20, v4, N/2);
+
+ vsetivli(zr, N/2, Assembler::e64, Assembler::m2, Assembler::mu, Assembler::tu);
+
+ vclmul_vv(v10, v4, v8);
+ vclmulh_vv(v12, v4, v8);
+
+ // lows
+ vslidedown_vi(v14, v10, 1);
+ vmand_mm(v0, v2, v2);
+ vxor_vv(v10, v10, v14, v0_t);
+ // with data part 2
+ vxor_vv(v4, v20, v10, v0_t);
+
+ // highs
+ vslideup_vi(v16, v12, 1);
+ vmand_mm(v0, v1, v1);
+ vxor_vv(v12, v12, v16, v0_t);
+ // with data part 2
+ vxor_vv(v4, v20, v12, v0_t);
+
+
+ // ======== folding into 16 bytes from 64 bytes in register ========
+
+ // v4: data, first part, 2 of 64-bits
+ // v16: data, second part, 2 of 64-bits
+ // v18: data, third part, 2 of 64-bits
+ // v20: data, second part, 2 of 64-bits
+ // v8: table
+
+ vslidedown_vi(v16, v4, 2);
+ vslidedown_vi(v18, v4, 4);
+ vslidedown_vi(v20, v4, 6);
+
+ vsetivli(zr, 2, Assembler::e64, Assembler::m1, Assembler::mu, Assembler::tu);
+
+ addi(vclmul_table, vclmul_table, TABLE_STEP);
+ vle64_v(v8, vclmul_table);
+ crc32_vclmul_fold_to_16_bytes_vectorsize_32(v4, v20, v8, v28, v29, v30, v31);
+
+ addi(vclmul_table, vclmul_table, TABLE_STEP);
+ vle64_v(v8, vclmul_table);
+ crc32_vclmul_fold_to_16_bytes_vectorsize_32(v16, v20, v8, v28, v29, v30, v31);
+
+ addi(vclmul_table, vclmul_table, TABLE_STEP);
+ vle64_v(v8, vclmul_table);
+ crc32_vclmul_fold_to_16_bytes_vectorsize_32(v18, v20, v8, v28, v29, v30, v31);
+
+
+ // ======== final: move result to scalar regsiters ========
+
+ vmv_x_s(tmp1, v20);
+ vslidedown_vi(v4, v20, 1);
+ vmv_x_s(tmp2, v4);
+
+ #undef CRC32_VCLMUL_LOAD_TABLE
+}
+
+// For more details of the algorithm, please check the paper:
+// "Fast CRC Computation for Generic Polynomials Using PCLMULQDQ Instruction - Intel"
+//
+// Please also refer to the corresponding code in aarch64 or x86 ones.
+//
+// As the riscv carry-less multiplication is a bit different from the other platforms,
+// so the implementation itself is also a bit different from others.
+
+void MacroAssembler::kernel_crc32_vclmul_fold(Register crc, Register buf, Register len,
+ Register table0, Register table1, Register table2, Register table3,
+ Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5) {
+ const int64_t single_table_size = 256;
+ const int64_t table_num = 8; // 4 for scalar, 4 for plain vector
+ const ExternalAddress table_addr = StubRoutines::crc_table_addr();
+ Register vclmul_table = tmp3;
+
+ la(vclmul_table, table_addr);
+ add(vclmul_table, vclmul_table, table_num*single_table_size*sizeof(juint), tmp1);
+ la(table0, table_addr);
+
+ if (MaxVectorSize == 16) {
+ kernel_crc32_vclmul_fold_vectorsize_16(crc, buf, len, vclmul_table, tmp1, tmp2);
+ } else {
+ kernel_crc32_vclmul_fold_vectorsize_32(crc, buf, len, vclmul_table, tmp1, tmp2);
+ }
+
+ mv(crc, zr);
+ update_word_crc32(crc, tmp1, tmp3, tmp4, tmp5, table0, table1, table2, table3, false);
+ update_word_crc32(crc, tmp1, tmp3, tmp4, tmp5, table0, table1, table2, table3, true);
+ update_word_crc32(crc, tmp2, tmp3, tmp4, tmp5, table0, table1, table2, table3, false);
+ update_word_crc32(crc, tmp2, tmp3, tmp4, tmp5, table0, table1, table2, table3, true);
+}
+
#endif // COMPILER2
/**
@@ -1765,7 +2118,9 @@ void MacroAssembler::kernel_crc32(Register crc, Register buf, Register len,
#ifdef COMPILER2
if (UseRVV) {
- const int64_t tmp_limit = MaxVectorSize >= 32 ? unroll_words*3 : unroll_words*5;
+ const int64_t tmp_limit =
+ UseZvbc ? 128 * 3 // 3 rounds of folding with carry-less multiplication
+ : MaxVectorSize >= 32 ? unroll_words*3 : unroll_words*5;
mv(tmp1, tmp_limit);
bge(len, tmp1, L_vector_entry);
}
@@ -1827,7 +2182,13 @@ void MacroAssembler::kernel_crc32(Register crc, Register buf, Register len,
j(L_exit);
bind(L_vector_entry);
- vector_update_crc32(crc, buf, len, tmp1, tmp2, tmp3, tmp4, tmp6, table0, table3);
+ if (UseZvbc) { // carry-less multiplication
+ kernel_crc32_vclmul_fold(crc, buf, len,
+ table0, table1, table2, table3,
+ tmp1, tmp2, tmp3, tmp4, tmp6);
+ } else { // plain vector instructions
+ vector_update_crc32(crc, buf, len, tmp1, tmp2, tmp3, tmp4, tmp6, table0, table3);
+ }
bgtz(len, L_by4_loop_entry);
}
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 0d28eaaf1f0..b7fba1d76d3 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -1309,6 +1309,24 @@ class MacroAssembler: public Assembler {
void vector_update_crc32(Register crc, Register buf, Register len,
Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
Register table0, Register table3);
+ void kernel_crc32_vclmul_fold(Register crc, Register buf, Register len,
+ Register table0, Register table1, Register table2, Register table3,
+ Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5);
+ void crc32_vclmul_fold_to_16_bytes_vectorsize_32(VectorRegister vx, VectorRegister vy, VectorRegister vt,
+ VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3, VectorRegister vtmp4);
+ void kernel_crc32_vclmul_fold_vectorsize_32(Register crc, Register buf, Register len,
+ Register vclmul_table, Register tmp1, Register tmp2);
+ void crc32_vclmul_fold_16_bytes_vectorsize_16(VectorRegister vx, VectorRegister vt,
+ VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3, VectorRegister vtmp4,
+ Register buf, Register tmp, const int STEP);
+ void crc32_vclmul_fold_16_bytes_vectorsize_16_2(VectorRegister vx, VectorRegister vy, VectorRegister vt,
+ VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3, VectorRegister vtmp4,
+ Register tmp);
+ void crc32_vclmul_fold_16_bytes_vectorsize_16_3(VectorRegister vx, VectorRegister vy, VectorRegister vt,
+ VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3, VectorRegister vtmp4,
+ Register tmp);
+ void kernel_crc32_vclmul_fold_vectorsize_16(Register crc, Register buf, Register len,
+ Register vclmul_table, Register tmp1, Register tmp2);
void mul_add(Register out, Register in, Register offset,
Register len, Register k, Register tmp);
diff --git a/src/hotspot/cpu/riscv/matcher_riscv.hpp b/src/hotspot/cpu/riscv/matcher_riscv.hpp
index 6e2b97b8202..ed1519ec150 100644
--- a/src/hotspot/cpu/riscv/matcher_riscv.hpp
+++ b/src/hotspot/cpu/riscv/matcher_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
index 3a273fdb3ed..48a9a84e481 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
index 5b276dde368..295e92bbc1b 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2018, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/riscv_b.ad b/src/hotspot/cpu/riscv/riscv_b.ad
index 6b7645858d8..535c0fd534d 100644
--- a/src/hotspot/cpu/riscv/riscv_b.ad
+++ b/src/hotspot/cpu/riscv/riscv_b.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2022, Huawei Technologies Co., Ltd. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 6894f3ce9fd..4b30a911152 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -116,6 +116,9 @@ source %{
return false;
}
+ bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen) {
+ return false;
+ }
%}
definitions %{
@@ -4422,41 +4425,6 @@ instruct vmask_reinterpret_diff_esize(vRegMask dst, vRegMask_V0 src, vReg tmp) %
ins_pipe(pipe_slow);
%}
-// ------------------------------ Vector shuffle -------------------------------
-
-instruct loadshuffleB(vReg dst) %{
- predicate(Matcher::vector_element_basic_type(n) == T_BYTE);
- match(Set dst (VectorLoadShuffle dst));
- format %{ "loadshuffleB $dst, $dst" %}
- ins_encode %{
- // For T_BYTE, no need to do anything
- %}
- ins_pipe(pipe_class_empty);
-%}
-
-instruct loadshuffleX(vReg dst, vReg src) %{
- predicate(Matcher::vector_element_basic_type(n) == T_DOUBLE ||
- Matcher::vector_element_basic_type(n) == T_LONG ||
- Matcher::vector_element_basic_type(n) == T_FLOAT ||
- Matcher::vector_element_basic_type(n) == T_INT ||
- Matcher::vector_element_basic_type(n) == T_SHORT);
- match(Set dst (VectorLoadShuffle src));
- effect(TEMP_DEF dst);
- format %{ "loadshuffleX $dst, $src" %}
- ins_encode %{
- BasicType bt = Matcher::vector_element_basic_type(this);
- __ vsetvli_helper(bt, Matcher::vector_length(this));
- if (bt == T_SHORT) {
- __ vzext_vf2(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
- } else if (bt == T_FLOAT || bt == T_INT) {
- __ vzext_vf4(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
- } else { // bt == T_DOUBLE || bt == T_LONG
- __ vzext_vf8(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
- }
- %}
- ins_pipe(pipe_slow);
-%}
-
// ------------------------------ Vector rearrange -----------------------------
instruct rearrange(vReg dst, vReg src, vReg shuffle) %{
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 5ab2a9f00b9..a8438ab4394 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1364,7 +1364,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
- BasicType* in_elem_bt = nullptr;
int argc = 0;
out_sig_bt[argc++] = T_ADDRESS;
@@ -1548,15 +1547,12 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// For JNI natives the incoming and outgoing registers are offset upwards.
GrowableArray<int> arg_order(2 * total_in_args);
- VMRegPair tmp_vmreg;
- tmp_vmreg.set2(x9->as_VMReg());
for (int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0; i--, c_arg--) {
arg_order.push(i);
arg_order.push(c_arg);
}
- int temploc = -1;
for (int ai = 0; ai < arg_order.length(); ai += 2) {
int i = arg_order.at(ai);
int c_arg = arg_order.at(ai + 1);
@@ -1760,7 +1756,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
}
Label safepoint_in_progress, safepoint_in_progress_done;
- Label after_transition;
// Switch thread to "native transition" state before reading the synchronization state.
// This additional state is necessary because reading and testing the synchronization
@@ -1799,7 +1794,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
__ mv(t0, _thread_in_Java);
__ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
__ sw(t0, Address(t1));
- __ bind(after_transition);
if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
// Check preemption for Object.wait()
diff --git a/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp b/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
index 9fc4f1d7b0a..541cb0cbcb5 100644
--- a/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/riscv/stubRoutines_riscv.cpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
index 28b797a639e..66a3ac3a994 100644
--- a/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -479,5 +479,17 @@ ATTRIBUTE_ALIGNED(4096) juint StubRoutines::riscv::_crc_table[] =
0x29413c29, 0x548c7116, 0xd2dba657, 0xaf16eb68, 0x05050e94,
0x78c843ab, 0xfe9f94ea, 0x8352d9d5, 0x71c95953, 0x0c04146c,
0x8a53c32d, 0xf79e8e12, 0x5d8d6bee, 0x204026d1, 0xa617f190,
- 0xdbdabcaf
+ 0xdbdabcaf,
+
+ // CRC32 table for carry-less multiplication implementation
+ 0xe88ef372UL, 0x00000001UL,
+ 0x4a7fe880UL, 0x00000001UL,
+ 0x54442bd4UL, 0x00000001UL,
+ 0xc6e41596UL, 0x00000001UL,
+ 0x3db1ecdcUL, 0x00000000UL,
+ 0x74359406UL, 0x00000001UL,
+ 0xf1da05aaUL, 0x00000000UL,
+ 0x5a546366UL, 0x00000001UL,
+ 0x751997d0UL, 0x00000001UL,
+ 0xccaa009eUL, 0x00000000UL,
};
diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
index a099d71475e..3bc5aeaa268 100644
--- a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
+++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp b/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
index 3b4f26b6dc3..8fb0530d98f 100644
--- a/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
+++ b/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 3b8d8119a8e..a30ae451606 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* Copyright (c) 2023, Rivos Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -154,10 +154,6 @@ void VM_Version::common_initialize() {
unaligned_access.value() != MISALIGNED_FAST);
}
- if (FLAG_IS_DEFAULT(AlignVector)) {
- FLAG_SET_DEFAULT(AlignVector, AvoidUnalignedAccesses);
- }
-
// See JDK-8026049
// This machine has fast unaligned memory accesses
if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
@@ -355,6 +351,14 @@ void VM_Version::c2_initialize() {
warning("Cannot enable UseZvbb on cpu without RVV support.");
}
+ // UseZvbc (depends on RVV).
+ if (UseZvbc && !UseRVV) {
+ if (!FLAG_IS_DEFAULT(UseZvbc)) {
+ warning("Cannot enable UseZvbc on cpu without RVV support.");
+ }
+ FLAG_SET_DEFAULT(UseZvbc, false);
+ }
+
// SHA's
if (FLAG_IS_DEFAULT(UseSHA)) {
FLAG_SET_DEFAULT(UseSHA, true);
@@ -440,6 +444,10 @@ void VM_Version::c2_initialize() {
warning("AES/CTR intrinsics are not available on this CPU");
FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
}
+
+ if (FLAG_IS_DEFAULT(AlignVector)) {
+ FLAG_SET_DEFAULT(AlignVector, AvoidUnalignedAccesses);
+ }
}
#endif // COMPILER2
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index e08838c3a6f..59b41892fef 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* Copyright (c) 2023, Rivos Inc. All rights reserved.
@@ -164,6 +164,7 @@ class VM_Version : public Abstract_VM_Version {
decl(ext_Zihintpause , "Zihintpause" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZihintpause)) \
decl(ext_Zacas , "Zacas" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZacas)) \
decl(ext_Zvbb , "Zvbb" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvbb)) \
+ decl(ext_Zvbc , "Zvbc" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvbc)) \
decl(ext_Zvfh , "Zvfh" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvfh)) \
decl(ext_Zvkn , "Zvkn" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvkn)) \
decl(ext_Zicond , "Zicond" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicond)) \
diff --git a/src/hotspot/cpu/riscv/vtableStubs_riscv.cpp b/src/hotspot/cpu/riscv/vtableStubs_riscv.cpp
index ce6d9c2f38f..573c5d901fc 100644
--- a/src/hotspot/cpu/riscv/vtableStubs_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vtableStubs_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/s390/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp
index 60e347a2d92..1ba90b69d17 100644
--- a/src/hotspot/cpu/s390/assembler_s390.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp
@@ -122,14 +122,14 @@ class RelAddr {
return is_in_range_of_RelAddr(target, pc, true);
}
static bool is_in_range_of_RelAddr16(ptrdiff_t distance) {
- return is_in_range_of_RelAddr((address)distance, 0, true);
+ return is_in_range_of_RelAddr((address)distance, nullptr, true);
}
static bool is_in_range_of_RelAddr32(address target, address pc) {
return is_in_range_of_RelAddr(target, pc, false);
}
static bool is_in_range_of_RelAddr32(ptrdiff_t distance) {
- return is_in_range_of_RelAddr((address)distance, 0, false);
+ return is_in_range_of_RelAddr((address)distance, nullptr, false);
}
static int pcrel_off(address target, address pc, bool shortForm) {
@@ -149,14 +149,14 @@ class RelAddr {
return pcrel_off(target, pc, true);
}
static int pcrel_off16(ptrdiff_t distance) {
- return pcrel_off((address)distance, 0, true);
+ return pcrel_off((address)distance, nullptr, true);
}
static int pcrel_off32(address target, address pc) {
return pcrel_off(target, pc, false);
}
static int pcrel_off32(ptrdiff_t distance) {
- return pcrel_off((address)distance, 0, false);
+ return pcrel_off((address)distance, nullptr, false);
}
static ptrdiff_t inv_pcrel_off16(int offset) {
@@ -637,6 +637,11 @@ class Assembler : public AbstractAssembler {
#define LCDBR_ZOPC (unsigned int)(179 << 24 | 19 << 16)
#define LCXBR_ZOPC (unsigned int)(179 << 24 | 67 << 16)
+ // Load Halfword Immediate on Condition
+ #define LOCHI_ZOPC (unsigned long)(0xECL << 40 | 0x42L)
+ #define LOCHHI_ZOPC (unsigned long)(0xECL << 40 | 0x4EL)
+ #define LOCGHI_ZOPC (unsigned long)(0xECL << 40 | 0x46L)
+
// Add
// RR, signed
#define AR_ZOPC (unsigned int)(26 << 8)
@@ -987,8 +992,8 @@ class Assembler : public AbstractAssembler {
#define BASR_ZOPC (unsigned int)(13 << 8)
#define BCT_ZOPC (unsigned int)(70 << 24)
#define BCTR_ZOPC (unsigned int)(6 << 8)
-#define BCTG_ZOPC (unsigned int)(227L << 40 | 70)
-#define BCTGR_ZOPC (unsigned long)(0xb946 << 16)
+#define BCTG_ZOPC (unsigned long)(227L << 40 | 70)
+#define BCTGR_ZOPC (unsigned int)(0xb946 << 16)
// Absolute
#define BC_ZOPC (unsigned int)(71 << 24)
#define BAL_ZOPC (unsigned int)(69 << 24)
@@ -2075,6 +2080,11 @@ class Assembler : public AbstractAssembler {
inline void z_llilh(Register r1, int64_t i2); // r1 = i2_imm16 ; uint64 <- (uint16<<16)
inline void z_llill(Register r1, int64_t i2); // r1 = i2_imm16 ; uint64 <- uint16
+ // load halfword immediate on condition
+ inline void z_lochi( Register r1, int64_t i2, branch_condition m3); // load immediate r1[32-63] = i2_simm16 ; int32 <- int16
+ inline void z_lochhi(Register r1, int64_t i2, branch_condition m3); // load immediate r1[ 0-31] = i2_simm16 ; int32 <- int16
+ inline void z_locghi(Register r1, int64_t i2, branch_condition m3); // load immediate r1[ 0-63] = i2_simm16 ; int64 <- int16
+
// insert immediate
inline void z_ic( Register r1, int64_t d2, Register x2, Register b2); // insert character
inline void z_icy( Register r1, int64_t d2, Register x2, Register b2); // insert character
diff --git a/src/hotspot/cpu/s390/assembler_s390.inline.hpp b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
index e9277b8bb6f..567f3d75a62 100644
--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
@@ -245,6 +245,11 @@ inline void Assembler::z_stcm (Register r1, int64_t m3, int64_t d2, Register b2)
inline void Assembler::z_stcmy(Register r1, int64_t m3, int64_t d2, Register b2) { emit_48( STCMY_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | rsymask_48(d2, b2)); }
inline void Assembler::z_stcmh(Register r1, int64_t m3, int64_t d2, Register b2) { emit_48( STCMH_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | rsymask_48(d2, b2)); }
+// load halfword immediate on condition
+inline void Assembler::z_lochi(Register r1, int64_t i2, branch_condition m3) { emit_48( LOCHI_ZOPC | reg(r1, 8, 48) | simm16(i2, 16, 48) | uimm4(m3, 12, 48)); }
+inline void Assembler::z_lochhi(Register r1, int64_t i2, branch_condition m3) { emit_48( LOCHHI_ZOPC | reg(r1, 8, 48) | simm16(i2, 16, 48) | uimm4(m3, 12, 48)); }
+inline void Assembler::z_locghi(Register r1, int64_t i2, branch_condition m3) { emit_48( LOCGHI_ZOPC | reg(r1, 8, 48) | simm16(i2, 16, 48) | uimm4(m3, 12, 48)); }
+
// memory-immediate instructions (8-bit immediate)
inline void Assembler::z_cli( int64_t d1, Register b1, int64_t i2) { emit_32( CLI_ZOPC | rsmask_32( d1, b1) | uimm8(i2, 8, 32)); }
inline void Assembler::z_mvi( int64_t d1, Register b1, int64_t i2) { emit_32( MVI_ZOPC | rsmask_32( d1, b1) | imm8(i2, 8, 32)); }
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp
index c8815f3a729..9fcf7c0c221 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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.
*
diff --git a/src/hotspot/cpu/s390/c2_globals_s390.hpp b/src/hotspot/cpu/s390/c2_globals_s390.hpp
index 7f780ca63a0..b8b45cbc80e 100644
--- a/src/hotspot/cpu/s390/c2_globals_s390.hpp
+++ b/src/hotspot/cpu/s390/c2_globals_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/compiledIC_s390.cpp b/src/hotspot/cpu/s390/compiledIC_s390.cpp
index 9c9073cb93d..7891e85b911 100644
--- a/src/hotspot/cpu/s390/compiledIC_s390.cpp
+++ b/src/hotspot/cpu/s390/compiledIC_s390.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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.
*
diff --git a/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp b/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
index 7223facaaeb..bee7bb72cbf 100644
--- a/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/s390/continuationHelper_s390.inline.hpp b/src/hotspot/cpu/s390/continuationHelper_s390.inline.hpp
index 8c57f1810e5..fb7d998c458 100644
--- a/src/hotspot/cpu/s390/continuationHelper_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/continuationHelper_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp
index 75f29be13ab..f461aa67b08 100644
--- a/src/hotspot/cpu/s390/frame_s390.cpp
+++ b/src/hotspot/cpu/s390/frame_s390.cpp
@@ -265,7 +265,7 @@ void frame::patch_pc(Thread* thread, address pc) {
p2i(&((address*) _sp)[-1]), p2i(((address*) _sp)[-1]), p2i(pc));
}
assert(!Continuation::is_return_barrier_entry(*pc_addr), "return barrier");
- assert(_pc == *pc_addr || pc == *pc_addr || 0 == *pc_addr,
+ assert(_pc == *pc_addr || pc == *pc_addr || nullptr == *pc_addr,
"must be (pc: " INTPTR_FORMAT " _pc: " INTPTR_FORMAT " pc_addr: " INTPTR_FORMAT
" *pc_addr: " INTPTR_FORMAT " sp: " INTPTR_FORMAT ")",
p2i(pc), p2i(_pc), p2i(pc_addr), p2i(*pc_addr), p2i(sp()));
@@ -296,10 +296,10 @@ void frame::patch_pc(Thread* thread, address pc) {
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
assert(is_interpreted_frame(), "Not an interpreted frame");
// These are reasonable sanity checks
- if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
+ if (fp() == nullptr || (intptr_t(fp()) & (wordSize-1)) != 0) {
return false;
}
- if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
+ if (sp() == nullptr || (intptr_t(sp()) & (wordSize-1)) != 0) {
return false;
}
int min_frame_slots = (z_common_abi_size + z_ijava_state_size) / sizeof(intptr_t);
@@ -420,7 +420,7 @@ void frame::back_trace(outputStream* st, intptr_t* start_sp, intptr_t* top_pc, u
? (address) top_pc
: (address) *((intptr_t*)(((address) current_sp) + _z_abi(return_pc)));
- if ((intptr_t*) current_fp != 0 && (intptr_t*) current_fp <= current_sp) {
+ if ((intptr_t*) current_fp != nullptr && (intptr_t*) current_fp <= current_sp) {
st->print_cr("ERROR: corrupt stack");
return;
}
@@ -503,7 +503,7 @@ void frame::back_trace(outputStream* st, intptr_t* start_sp, intptr_t* top_pc, u
case 0: // C frame:
{
st->print(" ");
- if (current_pc == 0) {
+ if (current_pc == nullptr) {
st->print("? ");
} else {
// name
diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
index 06433d9136f..b6e4726cd45 100644
--- a/src/hotspot/cpu/s390/frame_s390.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
index 8ead8e8ff38..550bc9ba109 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
index fb61adc55b5..acc0d3b4988 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
index 236d4c5bf69..6f789842b6c 100644
--- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
+++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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.
*
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index e8a04e9063b..a069d6ceafb 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -3426,7 +3426,7 @@ void MacroAssembler::lookup_secondary_supers_table_const(Register r_sub_klass,
z_bru(L_done); // pass whatever result we got from a slow path
bind(L_failure);
- // TODO: use load immediate on condition and z_bru above will not be required
+
z_lghi(r_result, 1);
bind(L_done);
@@ -4108,7 +4108,7 @@ void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
Register current = (src != noreg) ? src : dst; // Klass is in dst if no src provided. (dst == src) also possible.
address base = CompressedKlassPointers::base();
int shift = CompressedKlassPointers::shift();
- bool need_zero_extend = base != 0;
+ bool need_zero_extend = base != nullptr;
assert(UseCompressedClassPointers, "only for compressed klass ptrs");
BLOCK_COMMENT("cKlass encoder {");
diff --git a/src/hotspot/cpu/s390/methodHandles_s390.cpp b/src/hotspot/cpu/s390/methodHandles_s390.cpp
index b42822a6eee..b2071e28478 100644
--- a/src/hotspot/cpu/s390/methodHandles_s390.cpp
+++ b/src/hotspot/cpu/s390/methodHandles_s390.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/nativeInst_s390.cpp b/src/hotspot/cpu/s390/nativeInst_s390.cpp
index 4db73395d3a..6a6a774dfde 100644
--- a/src/hotspot/cpu/s390/nativeInst_s390.cpp
+++ b/src/hotspot/cpu/s390/nativeInst_s390.cpp
@@ -59,7 +59,7 @@ void NativeInstruction::verify() {
// - any address in first page (0x0000 .. 0x0fff)
// - odd address (will cause a "specification exception")
address addr = addr_at(0);
- if ((addr == 0) || (((unsigned long)addr & ~0x0fff) == 0) || ((intptr_t)addr & 1) != 0) {
+ if ((addr == nullptr) || (((unsigned long)addr & ~0x0fff) == 0) || ((intptr_t)addr & 1) != 0) {
tty->print_cr(INTPTR_FORMAT ": bad instruction address", p2i(addr));
fatal("not an instruction address");
}
diff --git a/src/hotspot/cpu/s390/registerSaver_s390.hpp b/src/hotspot/cpu/s390/registerSaver_s390.hpp
index 13674f1562d..a049f8b581b 100644
--- a/src/hotspot/cpu/s390/registerSaver_s390.hpp
+++ b/src/hotspot/cpu/s390/registerSaver_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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.
*
diff --git a/src/hotspot/cpu/s390/register_s390.cpp b/src/hotspot/cpu/s390/register_s390.cpp
index c0840add5d6..7292da43e5e 100644
--- a/src/hotspot/cpu/s390/register_s390.cpp
+++ b/src/hotspot/cpu/s390/register_s390.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/register_s390.hpp b/src/hotspot/cpu/s390/register_s390.hpp
index 6fcba746cd3..e7fdaa58d1a 100644
--- a/src/hotspot/cpu/s390/register_s390.hpp
+++ b/src/hotspot/cpu/s390/register_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/relocInfo_s390.cpp b/src/hotspot/cpu/s390/relocInfo_s390.cpp
index 9e352be20a3..8afd80df6ce 100644
--- a/src/hotspot/cpu/s390/relocInfo_s390.cpp
+++ b/src/hotspot/cpu/s390/relocInfo_s390.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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.
*
@@ -164,7 +164,6 @@ void Relocation::pd_set_call_destination(address x) {
address* Relocation::pd_address_in_code() {
ShouldNotReachHere();
- return 0;
}
address Relocation::pd_get_address_from_code() {
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index 0f1d98d54b9..6fb73a0e64c 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -1755,6 +1755,10 @@ bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
return false;
}
+bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen) {
+ return false;
+}
+
const RegMask* Matcher::predicate_reg_mask(void) {
return nullptr;
}
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 1844b0deb1c..2396a2a7105 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -1415,7 +1415,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
BasicType *out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
VMRegPair *out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
- BasicType* in_elem_bt = nullptr;
// Create the signature for the C call:
// 1) add the JNIEnv*
@@ -1867,8 +1866,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
break;
}
- Label after_transition;
-
// Switch thread to "native transition" state before reading the synchronization state.
// This additional state is necessary because reading and testing the synchronization
// state is not atomic w.r.t. GC, as this scenario demonstrates:
@@ -1924,7 +1921,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
//--------------------------------------------------------------------
// Transition from _thread_in_native_trans to _thread_in_Java.
__ set_thread_state(_thread_in_Java);
- __ bind(after_transition);
//--------------------------------------------------------------------
// Reguard any pages if necessary.
diff --git a/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp b/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
index 625d17cf992..3a0afb27260 100644
--- a/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/s390/stubGenerator_s390.cpp b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
index 9e33cd3abe8..0ff7dcbeed2 100644
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
@@ -688,7 +688,7 @@ class StubGenerator: public StubCodeGenerator {
// code (code_size == 0) confuses opjitconv
// StubCodeMark mark(this, "StubRoutines", "verify_oop_stub");
- address start = 0;
+ address start = nullptr;
#if !defined(PRODUCT)
start = CAST_FROM_FN_PTR(address, verify_oop_helper);
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index 820417fc743..4871706aadd 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/vmreg_s390.cpp b/src/hotspot/cpu/s390/vmreg_s390.cpp
index 5bec8313a48..d4d230eeb04 100644
--- a/src/hotspot/cpu/s390/vmreg_s390.cpp
+++ b/src/hotspot/cpu/s390/vmreg_s390.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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.
*
diff --git a/src/hotspot/cpu/s390/vmreg_s390.hpp b/src/hotspot/cpu/s390/vmreg_s390.hpp
index eb601f693ab..517fb8e2130 100644
--- a/src/hotspot/cpu/s390/vmreg_s390.hpp
+++ b/src/hotspot/cpu/s390/vmreg_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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.
*
diff --git a/src/hotspot/cpu/s390/vmreg_s390.inline.hpp b/src/hotspot/cpu/s390/vmreg_s390.inline.hpp
index b03a66b3086..14023b81f8e 100644
--- a/src/hotspot/cpu/s390/vmreg_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/vmreg_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/s390/vtableStubs_s390.cpp b/src/hotspot/cpu/s390/vtableStubs_s390.cpp
index 573c23d7967..d3af7fefcf1 100644
--- a/src/hotspot/cpu/s390/vtableStubs_s390.cpp
+++ b/src/hotspot/cpu/s390/vtableStubs_s390.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/x86/assembler_x86.inline.hpp b/src/hotspot/cpu/x86/assembler_x86.inline.hpp
index d2aa76fcf56..f5cc75a55c5 100644
--- a/src/hotspot/cpu/x86/assembler_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/c1_Defs_x86.hpp b/src/hotspot/cpu/x86/c1_Defs_x86.hpp
index e7ec63f83a7..1125097ee05 100644
--- a/src/hotspot/cpu/x86/c1_Defs_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_Defs_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 7cc6952e148..050cd0b69c2 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -1789,25 +1789,36 @@ void C2_MacroAssembler::load_vector_mask(KRegister dst, XMMRegister src, XMMRegi
}
}
-void C2_MacroAssembler::load_vector(XMMRegister dst, Address src, int vlen_in_bytes) {
- switch (vlen_in_bytes) {
- case 4: movdl(dst, src); break;
- case 8: movq(dst, src); break;
- case 16: movdqu(dst, src); break;
- case 32: vmovdqu(dst, src); break;
- case 64: evmovdqul(dst, src, Assembler::AVX_512bit); break;
- default: ShouldNotReachHere();
+void C2_MacroAssembler::load_vector(BasicType bt, XMMRegister dst, Address src, int vlen_in_bytes) {
+ if (is_integral_type(bt)) {
+ switch (vlen_in_bytes) {
+ case 4: movdl(dst, src); break;
+ case 8: movq(dst, src); break;
+ case 16: movdqu(dst, src); break;
+ case 32: vmovdqu(dst, src); break;
+ case 64: evmovdqul(dst, src, Assembler::AVX_512bit); break;
+ default: ShouldNotReachHere();
+ }
+ } else {
+ switch (vlen_in_bytes) {
+ case 4: movflt(dst, src); break;
+ case 8: movdbl(dst, src); break;
+ case 16: movups(dst, src); break;
+ case 32: vmovups(dst, src, Assembler::AVX_256bit); break;
+ case 64: vmovups(dst, src, Assembler::AVX_512bit); break;
+ default: ShouldNotReachHere();
+ }
}
}
-void C2_MacroAssembler::load_vector(XMMRegister dst, AddressLiteral src, int vlen_in_bytes, Register rscratch) {
+void C2_MacroAssembler::load_vector(BasicType bt, XMMRegister dst, AddressLiteral src, int vlen_in_bytes, Register rscratch) {
assert(rscratch != noreg || always_reachable(src), "missing");
if (reachable(src)) {
- load_vector(dst, as_Address(src), vlen_in_bytes);
+ load_vector(bt, dst, as_Address(src), vlen_in_bytes);
} else {
lea(rscratch, src);
- load_vector(dst, Address(rscratch, 0), vlen_in_bytes);
+ load_vector(bt, dst, Address(rscratch, 0), vlen_in_bytes);
}
}
@@ -1836,10 +1847,7 @@ void C2_MacroAssembler::load_constant_vector(BasicType bt, XMMRegister dst, Inte
} else if (VM_Version::supports_sse3()) {
movddup(dst, src);
} else {
- movq(dst, src);
- if (vlen == 16) {
- punpcklqdq(dst, dst);
- }
+ load_vector(bt, dst, src, vlen);
}
}
@@ -1850,7 +1858,7 @@ void C2_MacroAssembler::load_iota_indices(XMMRegister dst, int vlen_in_bytes, Ba
offset += 128;
}
ExternalAddress addr(StubRoutines::x86::vector_iota_indices() + offset);
- load_vector(dst, addr, vlen_in_bytes);
+ load_vector(T_BYTE, dst, addr, vlen_in_bytes);
}
// Reductions for vectors of bytes, shorts, ints, longs, floats, and doubles.
@@ -3543,11 +3551,11 @@ void C2_MacroAssembler::arrays_hashcode_elload(Register dst, Address src, BasicT
}
void C2_MacroAssembler::arrays_hashcode_elvload(XMMRegister dst, Address src, BasicType eltype) {
- load_vector(dst, src, arrays_hashcode_elsize(eltype) * 8);
+ load_vector(eltype, dst, src, arrays_hashcode_elsize(eltype) * 8);
}
void C2_MacroAssembler::arrays_hashcode_elvload(XMMRegister dst, AddressLiteral src, BasicType eltype) {
- load_vector(dst, src, arrays_hashcode_elsize(eltype) * 8);
+ load_vector(eltype, dst, src, arrays_hashcode_elsize(eltype) * 8);
}
void C2_MacroAssembler::arrays_hashcode_elvcast(XMMRegister dst, BasicType eltype) {
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index 0acee9041ed..032803dc4aa 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -140,8 +140,8 @@
void evpcmp(BasicType typ, KRegister kdmask, KRegister ksmask, XMMRegister src1, AddressLiteral src2, int comparison, int vector_len, Register rscratch = noreg);
void evpblend(BasicType typ, XMMRegister dst, KRegister kmask, XMMRegister src1, XMMRegister src2, bool merge, int vector_len);
- void load_vector(XMMRegister dst, Address src, int vlen_in_bytes);
- void load_vector(XMMRegister dst, AddressLiteral src, int vlen_in_bytes, Register rscratch = noreg);
+ void load_vector(BasicType bt, XMMRegister dst, Address src, int vlen_in_bytes);
+ void load_vector(BasicType bt, XMMRegister dst, AddressLiteral src, int vlen_in_bytes, Register rscratch = noreg);
void load_vector_mask(XMMRegister dst, XMMRegister src, int vlen_in_bytes, BasicType elem_bt, bool is_legacy);
void load_vector_mask(KRegister dst, XMMRegister src, XMMRegister xtmp, bool novlbwdq, int vlen_enc);
diff --git a/src/hotspot/cpu/x86/c2_globals_x86.hpp b/src/hotspot/cpu/x86/c2_globals_x86.hpp
index 084dde217e4..64dda0a8947 100644
--- a/src/hotspot/cpu/x86/c2_globals_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_globals_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/c2_intelJccErratum_x86.cpp b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.cpp
index 7b71a6bdbfc..e03e04339a1 100644
--- a/src/hotspot/cpu/x86/c2_intelJccErratum_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/c2_intelJccErratum_x86.hpp b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp
index 485a2d17c16..1644b36606e 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, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/compiledIC_x86.cpp b/src/hotspot/cpu/x86/compiledIC_x86.cpp
index e46f892b388..51563d35d5d 100644
--- a/src/hotspot/cpu/x86/compiledIC_x86.cpp
+++ b/src/hotspot/cpu/x86/compiledIC_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/downcallLinker_x86_64.cpp b/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
index e4b25ce00d6..00cc69651f1 100644
--- a/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
+++ b/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
index 1bfca7cd570..f71427b0c25 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
index d1937b93841..0880da7d30a 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 3795b1fc176..1bc8e5c4544 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
index 5fbc7ea1be1..91be2e3b945 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/gc/z/z_x86_64.ad b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
index 9555cadd022..045aa5d5381 100644
--- a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
// 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/cpu/x86/interpreterRT_x86_32.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp
index 1aee642917b..5747a5d10ef 100644
--- a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp
+++ b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/interpreterRT_x86_64.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp
index 867dd1a282a..c37287635ba 100644
--- a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp
+++ b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/matcher_x86.hpp b/src/hotspot/cpu/x86/matcher_x86.hpp
index 3d8b0ed092f..b311f4144b2 100644
--- a/src/hotspot/cpu/x86/matcher_x86.hpp
+++ b/src/hotspot/cpu/x86/matcher_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/register_x86.cpp b/src/hotspot/cpu/x86/register_x86.cpp
index bb26ab66051..dc5aba3c178 100644
--- a/src/hotspot/cpu/x86/register_x86.cpp
+++ b/src/hotspot/cpu/x86/register_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/register_x86.hpp b/src/hotspot/cpu/x86/register_x86.hpp
index 6844fdc248d..0a8ecb7be26 100644
--- a/src/hotspot/cpu/x86/register_x86.hpp
+++ b/src/hotspot/cpu/x86/register_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/runtime_x86_32.cpp b/src/hotspot/cpu/x86/runtime_x86_32.cpp
index 2a21c42a5e6..9bd4239d665 100644
--- a/src/hotspot/cpu/x86/runtime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_32.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index eb3bab36b88..45f863b697b 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/sharedRuntime_x86.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86.cpp
index 78330962d1a..ebdd47f3a3f 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
index 1f0df94680a..409cfe6580d 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -1363,7 +1363,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
- BasicType* in_elem_bt = nullptr;
int argc = 0;
out_sig_bt[argc++] = T_ADDRESS;
@@ -1757,8 +1756,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
default : ShouldNotReachHere();
}
- Label after_transition;
-
// Switch thread to "native transition" state before reading the synchronization state.
// This additional state is necessary because reading and testing the synchronization
// state is not atomic w.r.t. GC, as this scenario demonstrates:
@@ -1809,7 +1806,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// change thread state
__ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_Java);
- __ bind(after_transition);
Label reguard;
Label reguard_done;
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 2f4a3b57936..be07d136e26 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -2171,7 +2171,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
- BasicType* in_elem_bt = nullptr;
int argc = 0;
out_sig_bt[argc++] = T_ADDRESS;
@@ -2369,15 +2368,11 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// For JNI natives the incoming and outgoing registers are offset upwards.
GrowableArray<int> arg_order(2 * total_in_args);
- VMRegPair tmp_vmreg;
- tmp_vmreg.set2(rbx->as_VMReg());
-
for (int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0; i--, c_arg--) {
arg_order.push(i);
arg_order.push(c_arg);
}
- int temploc = -1;
for (int ai = 0; ai < arg_order.length(); ai += 2) {
int i = arg_order.at(ai);
int c_arg = arg_order.at(ai + 1);
@@ -2600,8 +2595,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
default : ShouldNotReachHere();
}
- Label after_transition;
-
// Switch thread to "native transition" state before reading the synchronization state.
// This additional state is necessary because reading and testing the synchronization
// state is not atomic w.r.t. GC, as this scenario demonstrates:
@@ -2651,7 +2644,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// change thread state
__ movl(Address(r15_thread, JavaThread::thread_state_offset()), _thread_in_Java);
- __ bind(after_transition);
if (LockingMode != LM_LEGACY && method->is_object_wait0()) {
// Check preemption for Object.wait()
diff --git a/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp b/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
index 63212a686af..930a8af0794 100644
--- a/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
index af57fda23fd..0a6d091de8c 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
@@ -38,7 +38,7 @@ enum platform_dependent_constants {
// AVX512 intrinsics add more code in 64-bit VM,
// Windows have more code to save/restore registers
_compiler_stubs_code_size = 20000 LP64_ONLY(+47000) WINDOWS_ONLY(+2000),
- _final_stubs_code_size = 10000 LP64_ONLY(+20000) WINDOWS_ONLY(+2000) ZGC_ONLY(+20000)
+ _final_stubs_code_size = 10000 LP64_ONLY(+20000) WINDOWS_ONLY(+22000) ZGC_ONLY(+20000)
};
class x86 {
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp b/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp
index eb6c11d7167..f37d6698d39 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/upcallLinker_x86_32.cpp b/src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
index d795c751d02..6ccf965a771 100644
--- a/src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
+++ b/src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/upcallLinker_x86_64.cpp b/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
index bc261bfd93f..e2dadf7f0ef 100644
--- a/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
+++ b/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/vmreg_x86.hpp b/src/hotspot/cpu/x86/vmreg_x86.hpp
index 7d73eadeb04..6f7c7fafb32 100644
--- a/src/hotspot/cpu/x86/vmreg_x86.hpp
+++ b/src/hotspot/cpu/x86/vmreg_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/vtableStubs_x86_32.cpp b/src/hotspot/cpu/x86/vtableStubs_x86_32.cpp
index 398f2e37eb5..8d3ceca7b4a 100644
--- a/src/hotspot/cpu/x86/vtableStubs_x86_32.cpp
+++ b/src/hotspot/cpu/x86/vtableStubs_x86_32.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/vtableStubs_x86_64.cpp b/src/hotspot/cpu/x86/vtableStubs_x86_64.cpp
index c2666e158db..4b70c2e71a1 100644
--- a/src/hotspot/cpu/x86/vtableStubs_x86_64.cpp
+++ b/src/hotspot/cpu/x86/vtableStubs_x86_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 800b7f08c51..e6bca719d99 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -2211,6 +2211,19 @@ bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
return false;
}
+// Return true if Vector::rearrange needs preparation of the shuffle argument
+bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen) {
+ switch (elem_bt) {
+ case T_BYTE: return false;
+ case T_SHORT: return !VM_Version::supports_avx512bw();
+ case T_INT: return !VM_Version::supports_avx();
+ case T_LONG: return vlen < 8 && !VM_Version::supports_avx512vl();
+ default:
+ ShouldNotReachHere();
+ return false;
+ }
+}
+
MachOper* Matcher::pd_specialize_generic_vector_operand(MachOper* generic_opnd, uint ideal_reg, bool is_temp) {
assert(Matcher::is_generic_vector(generic_opnd), "not generic");
bool legacy = (generic_opnd->opcode() == LEGVEC);
@@ -2762,20 +2775,40 @@ void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
}
template <class T>
-static inline GrowableArray<jvalue>* vreplicate_imm(BasicType bt, T con, int len) {
- GrowableArray<jvalue>* val = new GrowableArray<jvalue>(len);
- jvalue ele;
- switch (bt) {
- case T_BYTE: ele.b = con; break;
- case T_SHORT: ele.s = con; break;
- case T_INT: ele.i = con; break;
- case T_LONG: ele.j = con; break;
- case T_FLOAT: ele.f = con; break;
- case T_DOUBLE: ele.d = con; break;
- default: ShouldNotReachHere();
- }
+static inline GrowableArray<jbyte>* vreplicate_imm(BasicType bt, T con, int len) {
+ int size = type2aelembytes(bt) * len;
+ GrowableArray<jbyte>* val = new GrowableArray<jbyte>(size, size, 0);
for (int i = 0; i < len; i++) {
- val->append(ele);
+ int offset = i * type2aelembytes(bt);
+ switch (bt) {
+ case T_BYTE: val->at(i) = con; break;
+ case T_SHORT: {
+ jshort c = con;
+ memcpy(val->adr_at(offset), &c, sizeof(jshort));
+ break;
+ }
+ case T_INT: {
+ jint c = con;
+ memcpy(val->adr_at(offset), &c, sizeof(jint));
+ break;
+ }
+ case T_LONG: {
+ jlong c = con;
+ memcpy(val->adr_at(offset), &c, sizeof(jlong));
+ break;
+ }
+ case T_FLOAT: {
+ jfloat c = con;
+ memcpy(val->adr_at(offset), &c, sizeof(jfloat));
+ break;
+ }
+ case T_DOUBLE: {
+ jdouble c = con;
+ memcpy(val->adr_at(offset), &c, sizeof(jdouble));
+ break;
+ }
+ default: assert(false, "%s", type2name(bt));
+ }
}
return val;
}
@@ -4093,7 +4126,8 @@ instruct loadV(vec dst, memory mem) %{
ins_cost(125);
format %{ "load_vector $dst,$mem" %}
ins_encode %{
- __ load_vector($dst$$XMMRegister, $mem$$Address, Matcher::vector_length_in_bytes(this));
+ BasicType bt = Matcher::vector_element_basic_type(this);
+ __ load_vector(bt, $dst$$XMMRegister, $mem$$Address, Matcher::vector_length_in_bytes(this));
%}
ins_pipe( pipe_slow );
%}
@@ -4576,10 +4610,9 @@ instruct ReplI_imm(vec dst, immI con) %{
match(Set dst (Replicate con));
format %{ "replicateI $dst,$con" %}
ins_encode %{
- InternalAddress addr = $constantaddress(Matcher::vector_element_basic_type(this),
- vreplicate_imm(Matcher::vector_element_basic_type(this), $con$$constant,
- (VM_Version::supports_sse3() ? (VM_Version::supports_avx() ? 4 : 8) : 8) /
- type2aelembytes(Matcher::vector_element_basic_type(this))));
+ InternalAddress addr = $constantaddress(vreplicate_imm(Matcher::vector_element_basic_type(this), $con$$constant,
+ (VM_Version::supports_sse3() ? (VM_Version::supports_avx() ? 4 : 8) : 16) /
+ type2aelembytes(Matcher::vector_element_basic_type(this))));
BasicType bt = Matcher::vector_element_basic_type(this);
int vlen = Matcher::vector_length_in_bytes(this);
__ load_constant_vector(bt, $dst$$XMMRegister, addr, vlen);
@@ -4717,7 +4750,7 @@ instruct ReplL_imm(vec dst, immL con) %{
match(Set dst (Replicate con));
format %{ "replicateL $dst,$con" %}
ins_encode %{
- InternalAddress addr = $constantaddress(T_LONG, vreplicate_imm(T_LONG, $con$$constant, 1));
+ InternalAddress addr = $constantaddress(vreplicate_imm(T_LONG, $con$$constant, VM_Version::supports_sse3() ? 1 : 2));
int vlen = Matcher::vector_length_in_bytes(this);
__ load_constant_vector(T_LONG, $dst$$XMMRegister, addr, vlen);
%}
@@ -4799,8 +4832,8 @@ instruct ReplF_imm(vec dst, immF con) %{
match(Set dst (Replicate con));
format %{ "replicateF $dst,$con" %}
ins_encode %{
- InternalAddress addr = $constantaddress(T_FLOAT, vreplicate_imm(T_FLOAT, $con$$constant,
- VM_Version::supports_sse3() ? (VM_Version::supports_avx() ? 1 : 2) : 2));
+ InternalAddress addr = $constantaddress(vreplicate_imm(T_FLOAT, $con$$constant,
+ VM_Version::supports_sse3() ? (VM_Version::supports_avx() ? 1 : 2) : 4));
int vlen = Matcher::vector_length_in_bytes(this);
__ load_constant_vector(T_FLOAT, $dst$$XMMRegister, addr, vlen);
%}
@@ -4876,7 +4909,7 @@ instruct ReplD_imm(vec dst, immD con) %{
match(Set dst (Replicate con));
format %{ "replicateD $dst,$con" %}
ins_encode %{
- InternalAddress addr = $constantaddress(T_DOUBLE, vreplicate_imm(T_DOUBLE, $con$$constant, 1));
+ InternalAddress addr = $constantaddress(vreplicate_imm(T_DOUBLE, $con$$constant, VM_Version::supports_sse3() ? 1 : 2));
int vlen = Matcher::vector_length_in_bytes(this);
__ load_constant_vector(T_DOUBLE, $dst$$XMMRegister, addr, vlen);
%}
@@ -8873,17 +8906,6 @@ instruct VectorPopulateLIndex(vec dst, rRegL src1, immI_1 src2, vec vtmp) %{
//-------------------------------- Rearrange ----------------------------------
// LoadShuffle/Rearrange for Byte
-
-instruct loadShuffleB(vec dst) %{
- predicate(Matcher::vector_element_basic_type(n) == T_BYTE);
- match(Set dst (VectorLoadShuffle dst));
- format %{ "vector_load_shuffle $dst, $dst" %}
- ins_encode %{
- // empty
- %}
- ins_pipe( pipe_slow );
-%}
-
instruct rearrangeB(vec dst, vec shuffle) %{
predicate(Matcher::vector_element_basic_type(n) == T_BYTE &&
Matcher::vector_length(n) < 32);
@@ -8950,7 +8972,7 @@ instruct rearrangeB_evex_vbmi(vec dst, vec src, vec shuffle) %{
instruct loadShuffleS(vec dst, vec src, vec vtmp) %{
predicate(Matcher::vector_element_basic_type(n) == T_SHORT &&
- Matcher::vector_length(n) <= 16 && !VM_Version::supports_avx512bw()); // NB! aligned with rearrangeS
+ !VM_Version::supports_avx512bw());
match(Set dst (VectorLoadShuffle src));
effect(TEMP dst, TEMP vtmp);
format %{ "vector_load_shuffle $dst, $src\t! using $vtmp as TEMP" %}
@@ -8961,7 +8983,7 @@ instruct loadShuffleS(vec dst, vec src, vec vtmp) %{
if (UseAVX == 0) {
assert(vlen_in_bytes <= 16, "required");
// Multiply each shuffle by two to get byte index
- __ pmovzxbw($vtmp$$XMMRegister, $src$$XMMRegister);
+ __ movdqu($vtmp$$XMMRegister, $src$$XMMRegister);
__ psllw($vtmp$$XMMRegister, 1);
// Duplicate to create 2 copies of byte index
@@ -8976,8 +8998,7 @@ instruct loadShuffleS(vec dst, vec src, vec vtmp) %{
assert(UseAVX > 1 || vlen_in_bytes <= 16, "required");
int vlen_enc = vector_length_encoding(this);
// Multiply each shuffle by two to get byte index
- __ vpmovzxbw($vtmp$$XMMRegister, $src$$XMMRegister, vlen_enc);
- __ vpsllw($vtmp$$XMMRegister, $vtmp$$XMMRegister, 1, vlen_enc);
+ __ vpsllw($vtmp$$XMMRegister, $src$$XMMRegister, 1, vlen_enc);
// Duplicate to create 2 copies of byte index
__ vpsllw($dst$$XMMRegister, $vtmp$$XMMRegister, 8, vlen_enc);
@@ -9024,21 +9045,6 @@ instruct rearrangeS_avx(legVec dst, legVec src, vec shuffle, legVec vtmp1, legVe
ins_pipe( pipe_slow );
%}
-instruct loadShuffleS_evex(vec dst, vec src) %{
- predicate(Matcher::vector_element_basic_type(n) == T_SHORT &&
- VM_Version::supports_avx512bw());
- match(Set dst (VectorLoadShuffle src));
- format %{ "vector_load_shuffle $dst, $src" %}
- ins_encode %{
- int vlen_enc = vector_length_encoding(this);
- if (!VM_Version::supports_avx512vl()) {
- vlen_enc = Assembler::AVX_512bit;
- }
- __ vpmovzxbw($dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
- %}
- ins_pipe( pipe_slow );
-%}
-
instruct rearrangeS_evex(vec dst, vec src, vec shuffle) %{
predicate(Matcher::vector_element_basic_type(n) == T_SHORT &&
VM_Version::supports_avx512bw());
@@ -9069,7 +9075,7 @@ instruct loadShuffleI(vec dst, vec src, vec vtmp) %{
// only byte shuffle instruction available on these platforms
// Duplicate and multiply each shuffle by 4
- __ pmovzxbd($vtmp$$XMMRegister, $src$$XMMRegister);
+ __ movdqu($vtmp$$XMMRegister, $src$$XMMRegister);
__ pshuflw($vtmp$$XMMRegister, $vtmp$$XMMRegister, 0xA0);
__ pshufhw($vtmp$$XMMRegister, $vtmp$$XMMRegister, 0xA0);
__ psllw($vtmp$$XMMRegister, 2);
@@ -9098,18 +9104,6 @@ instruct rearrangeI(vec dst, vec shuffle) %{
ins_pipe( pipe_slow );
%}
-instruct loadShuffleI_avx(vec dst, vec src) %{
- predicate((Matcher::vector_element_basic_type(n) == T_INT || Matcher::vector_element_basic_type(n) == T_FLOAT) &&
- UseAVX > 0);
- match(Set dst (VectorLoadShuffle src));
- format %{ "vector_load_shuffle $dst, $src" %}
- ins_encode %{
- int vlen_enc = vector_length_encoding(this);
- __ vpmovzxbd($dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
- %}
- ins_pipe( pipe_slow );
-%}
-
instruct rearrangeI_avx(vec dst, vec src, vec shuffle) %{
predicate((Matcher::vector_element_basic_type(n) == T_INT || Matcher::vector_element_basic_type(n) == T_FLOAT) &&
UseAVX > 0);
@@ -9139,8 +9133,7 @@ instruct loadShuffleL(vec dst, vec src, vec vtmp) %{
// only double word shuffle instruction available on these platforms
// Multiply each shuffle by two to get double word index
- __ vpmovzxbq($vtmp$$XMMRegister, $src$$XMMRegister, vlen_enc);
- __ vpsllq($vtmp$$XMMRegister, $vtmp$$XMMRegister, 1, vlen_enc);
+ __ vpsllq($vtmp$$XMMRegister, $src$$XMMRegister, 1, vlen_enc);
// Duplicate each double word shuffle
__ vpsllq($dst$$XMMRegister, $vtmp$$XMMRegister, 32, vlen_enc);
@@ -9166,20 +9159,6 @@ instruct rearrangeL(vec dst, vec src, vec shuffle) %{
ins_pipe( pipe_slow );
%}
-instruct loadShuffleL_evex(vec dst, vec src) %{
- predicate(is_double_word_type(Matcher::vector_element_basic_type(n)) && // T_LONG, T_DOUBLE
- (Matcher::vector_length(n) == 8 || VM_Version::supports_avx512vl()));
- match(Set dst (VectorLoadShuffle src));
- format %{ "vector_load_shuffle $dst, $src" %}
- ins_encode %{
- assert(UseAVX > 2, "required");
-
- int vlen_enc = vector_length_encoding(this);
- __ vpmovzxbq($dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
- %}
- ins_pipe( pipe_slow );
-%}
-
instruct rearrangeL_evex(vec dst, vec src, vec shuffle) %{
predicate(is_double_word_type(Matcher::vector_element_basic_type(n)) && // T_LONG, T_DOUBLE
(Matcher::vector_length(n) == 8 || VM_Version::supports_avx512vl()));
@@ -9788,7 +9767,7 @@ instruct vreverse_reg_gfni(vec dst, vec src, vec xtmp) %{
ins_encode %{
int vec_enc = vector_length_encoding(this);
BasicType bt = Matcher::vector_element_basic_type(this);
- InternalAddress addr = $constantaddress(T_LONG, vreplicate_imm(T_LONG, 0x8040201008040201L, 1));
+ InternalAddress addr = $constantaddress(jlong(0x8040201008040201));
__ vector_reverse_bit_gfni(bt, $dst$$XMMRegister, $src$$XMMRegister, addr, vec_enc,
$xtmp$$XMMRegister);
%}
diff --git a/src/hotspot/cpu/zero/c2_MacroAssembler_zero.hpp b/src/hotspot/cpu/zero/c2_MacroAssembler_zero.hpp
index 3efa561c8e6..ed7eda8c5b7 100644
--- a/src/hotspot/cpu/zero/c2_MacroAssembler_zero.hpp
+++ b/src/hotspot/cpu/zero/c2_MacroAssembler_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/zero/compiledIC_zero.cpp b/src/hotspot/cpu/zero/compiledIC_zero.cpp
index 7db93a5f3cf..869d96e65f8 100644
--- a/src/hotspot/cpu/zero/compiledIC_zero.cpp
+++ b/src/hotspot/cpu/zero/compiledIC_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/zero/continuationFreezeThaw_zero.inline.hpp b/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
index b1bd138e357..de2769fb376 100644
--- a/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/zero/continuationHelper_zero.inline.hpp b/src/hotspot/cpu/zero/continuationHelper_zero.inline.hpp
index 9829d32dc7f..a1f782623b2 100644
--- a/src/hotspot/cpu/zero/continuationHelper_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/continuationHelper_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/zero/frame_zero.cpp b/src/hotspot/cpu/zero/frame_zero.cpp
index 400766298f5..f049c4bda25 100644
--- a/src/hotspot/cpu/zero/frame_zero.cpp
+++ b/src/hotspot/cpu/zero/frame_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2021, Red Hat, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/zero/frame_zero.hpp b/src/hotspot/cpu/zero/frame_zero.hpp
index a4815d2c10b..af9abe22cbe 100644
--- a/src/hotspot/cpu/zero/frame_zero.hpp
+++ b/src/hotspot/cpu/zero/frame_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/zero/frame_zero.inline.hpp b/src/hotspot/cpu/zero/frame_zero.inline.hpp
index 944084f70af..d34349a17d4 100644
--- a/src/hotspot/cpu/zero/frame_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/frame_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
index d05e5deb0f8..1c6ab9e9b53 100644
--- a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
+++ b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2009, 2021, Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/zero/nativeInst_zero.hpp b/src/hotspot/cpu/zero/nativeInst_zero.hpp
index 2f3d9b80617..fd8f03f1a59 100644
--- a/src/hotspot/cpu/zero/nativeInst_zero.hpp
+++ b/src/hotspot/cpu/zero/nativeInst_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/zero/sharedRuntime_zero.cpp b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
index 05adb86e769..9c21d34a6b8 100644
--- a/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
+++ b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp b/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
index 51fb114f595..bbb70fa2065 100644
--- a/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/zero/upcallLinker_zero.cpp b/src/hotspot/cpu/zero/upcallLinker_zero.cpp
index 408ebc32820..5dbc3cb6297 100644
--- a/src/hotspot/cpu/zero/upcallLinker_zero.cpp
+++ b/src/hotspot/cpu/zero/upcallLinker_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cpu/zero/vm_version_zero.cpp b/src/hotspot/cpu/zero/vm_version_zero.cpp
index 7312dd11646..1706be3089d 100644
--- a/src/hotspot/cpu/zero/vm_version_zero.cpp
+++ b/src/hotspot/cpu/zero/vm_version_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
index c7e6a139831..3e05eb1448d 100644
--- a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
+++ b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/os/aix/vmStructs_aix.hpp b/src/hotspot/os/aix/vmStructs_aix.hpp
index f3bbc80e62c..fb4b6409aaa 100644
--- a/src/hotspot/os/aix/vmStructs_aix.hpp
+++ b/src/hotspot/os/aix/vmStructs_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/bsd/vmStructs_bsd.hpp b/src/hotspot/os/bsd/vmStructs_bsd.hpp
index 8c9c132e1c2..b29067a9024 100644
--- a/src/hotspot/os/bsd/vmStructs_bsd.hpp
+++ b/src/hotspot/os/bsd/vmStructs_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/linux/cgroupSubsystem_linux.hpp b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
index 40948dc5e28..3a1a93a2573 100644
--- a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
+++ b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/linux/globals_linux.hpp b/src/hotspot/os/linux/globals_linux.hpp
index 90cb00fb7e6..331690ec3ee 100644
--- a/src/hotspot/os/linux/globals_linux.hpp
+++ b/src/hotspot/os/linux/globals_linux.hpp
@@ -36,10 +36,7 @@
constraint) \
\
product(bool, UseOprofile, false, \
- "enable support for Oprofile profiler") \
- \
- product(bool, UseLinuxPosixThreadCPUClocks, true, \
- "(Deprecated) enable fast Linux Posix clocks where available") \
+ "(Deprecated) enable support for Oprofile profiler") \
\
product(bool, UseTransparentHugePages, false, \
"Use MADV_HUGEPAGE for large pages") \
diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp
index 25e8eb46410..ecac7307c30 100644
--- a/src/hotspot/os/linux/osContainer_linux.cpp
+++ b/src/hotspot/os/linux/osContainer_linux.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp
index fb837ec0bd6..dd29c7a4769 100644
--- a/src/hotspot/os/linux/osContainer_linux.hpp
+++ b/src/hotspot/os/linux/osContainer_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index ed832f37bdf..ac943096917 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -1484,9 +1484,6 @@ double os::elapsedVTime() {
}
void os::Linux::fast_thread_clock_init() {
- if (!UseLinuxPosixThreadCPUClocks) {
- return;
- }
clockid_t clockid;
struct timespec tp;
int (*pthread_getcpuclockid_func)(pthread_t, clockid_t *) =
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index 1d4aecda936..a2a13baa24f 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/linux/systemMemoryBarrier_linux.cpp b/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
index a6b26928520..2398beb7360 100644
--- a/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
+++ b/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/linux/vmStructs_linux.hpp b/src/hotspot/os/linux/vmStructs_linux.hpp
index 3b82ac58ac6..2696a891f56 100644
--- a/src/hotspot/os/linux/vmStructs_linux.hpp
+++ b/src/hotspot/os/linux/vmStructs_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/posix/os_posix.hpp b/src/hotspot/os/posix/os_posix.hpp
index cac5b250cdf..248a30d04ad 100644
--- a/src/hotspot/os/posix/os_posix.hpp
+++ b/src/hotspot/os/posix/os_posix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp b/src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp
index 181d0fada59..0a66f04d31c 100644
--- a/src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp
+++ b/src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/windows/gc/z/zVirtualMemory_windows.cpp b/src/hotspot/os/windows/gc/z/zVirtualMemory_windows.cpp
index 7448fd18e0b..294935eda86 100644
--- a/src/hotspot/os/windows/gc/z/zVirtualMemory_windows.cpp
+++ b/src/hotspot/os/windows/gc/z/zVirtualMemory_windows.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/windows/osThread_windows.cpp b/src/hotspot/os/windows/osThread_windows.cpp
index 922b4b0104b..abbff6b3a78 100644
--- a/src/hotspot/os/windows/osThread_windows.cpp
+++ b/src/hotspot/os/windows/osThread_windows.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/windows/osThread_windows.hpp b/src/hotspot/os/windows/osThread_windows.hpp
index e54783aef1c..76fb8cf83f5 100644
--- a/src/hotspot/os/windows/osThread_windows.hpp
+++ b/src/hotspot/os/windows/osThread_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/windows/os_windows.inline.hpp b/src/hotspot/os/windows/os_windows.inline.hpp
index e9b30a33dfd..41471224b6c 100644
--- a/src/hotspot/os/windows/os_windows.inline.hpp
+++ b/src/hotspot/os/windows/os_windows.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os/windows/vmStructs_windows.hpp b/src/hotspot/os/windows/vmStructs_windows.hpp
index 93f4ea7c811..26ad17bb166 100644
--- a/src/hotspot/os/windows/vmStructs_windows.hpp
+++ b/src/hotspot/os/windows/vmStructs_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os_cpu/aix_ppc/javaThread_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.cpp
index a4d34d05df5..3ec846460a1 100644
--- a/src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.cpp
+++ b/src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014 SAP SE. All rights reserved.
* Copyright (c) 2022, IBM Corp.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
index 123cd67248f..d09b0125f25 100644
--- a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
index c384afac7ec..24d5c0f4dc6 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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.
diff --git a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
index b48ea82712e..4f6c4414f5f 100644
--- a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os_cpu/bsd_zero/os_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
index 4ecdbe93ebf..fa64c857eee 100644
--- a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
+++ b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
index 3c8e9c44414..6cc6d73be77 100644
--- a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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.
*
diff --git a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
index 120726bf55f..a1b73bdee8f 100644
--- a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os_cpu/linux_ppc/javaThread_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp
index 191b7315205..71d3aaddaec 100644
--- a/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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.
*
diff --git a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
index ae948c73031..46288cdeaab 100644
--- a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
index b3e35d6cc10..bde8181ebf3 100644
--- a/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
+++ b/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
index 368d6c971fa..f46380aaac6 100644
--- a/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
+++ b/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp b/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
index f785d935393..e65254fc571 100644
--- a/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Rivos Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -178,6 +178,9 @@ void RiscvHwprobe::add_features_from_query_result() {
if (is_set(RISCV_HWPROBE_KEY_IMA_EXT_0, RISCV_HWPROBE_EXT_ZFH)) {
VM_Version::ext_Zfh.enable_feature();
}
+ if (is_set(RISCV_HWPROBE_KEY_IMA_EXT_0, RISCV_HWPROBE_EXT_ZVBC)) {
+ VM_Version::ext_Zvbc.enable_feature();
+ }
if (is_set(RISCV_HWPROBE_KEY_IMA_EXT_0, RISCV_HWPROBE_EXT_ZVFH)) {
VM_Version::ext_Zvfh.enable_feature();
}
diff --git a/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
index 3946394c19b..b39a329335a 100644
--- a/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
+++ b/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
index a3a226502f6..323cab44627 100644
--- a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
* Copyright (c) 2023, Rivos Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
index a0fb5eb1a6a..a52bc722579 100644
--- a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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.
*
diff --git a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
index 8f6d3657237..ddba9daf131 100644
--- a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os_cpu/linux_zero/os_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
index d8498f104c2..e8d67bcdddc 100644
--- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp b/src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp
index 96a34fe967b..c70ea69725e 100644
--- a/src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp
+++ b/src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2020, Microsoft Corporation. All rights reserved.
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/os_cpu/windows_x86/vmStructs_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
index 985a6a331da..4ed62839d51 100644
--- a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/adlc/output_h.cpp b/src/hotspot/share/adlc/output_h.cpp
index 9d54d840688..d6767bc1f7e 100644
--- a/src/hotspot/share/adlc/output_h.cpp
+++ b/src/hotspot/share/adlc/output_h.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/asm/assembler.hpp b/src/hotspot/share/asm/assembler.hpp
index d05278f7fe1..9abd3eb7171 100644
--- a/src/hotspot/share/asm/assembler.hpp
+++ b/src/hotspot/share/asm/assembler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -480,26 +480,12 @@ class AbstractAssembler : public ResourceObj {
}
return ptr;
}
- address array_constant(BasicType bt, GrowableArray<jvalue>* c, int alignment) {
+ address array_constant(const GrowableArray<jbyte>* c, int alignment) {
CodeSection* c1 = _code_section;
- int len = c->length();
- int size = type2aelembytes(bt) * len;
- address ptr = start_a_const(size, alignment);
+ address ptr = start_a_const(c->length(), alignment);
if (ptr != nullptr) {
- for (int i = 0; i < len; i++) {
- jvalue e = c->at(i);
- switch(bt) {
- case T_BOOLEAN: emit_int8(e.z); break;
- case T_BYTE: emit_int8(e.b); break;
- case T_CHAR: emit_int16(e.c); break;
- case T_SHORT: emit_int16(e.s); break;
- case T_INT: emit_int32(e.i); break;
- case T_LONG: emit_int64(e.j); break;
- case T_FLOAT: emit_float(e.f); break;
- case T_DOUBLE: emit_double(e.d); break;
- default:
- ShouldNotReachHere();
- }
+ for (int i = 0; i < c->length(); i++) {
+ emit_int8(c->at(i));
}
end_a_const(c1);
}
diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index b25e07bc36d..4aaf8b6daa2 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -889,6 +889,7 @@ void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {
// Create a new (temporary) code buffer to hold all the new data
CodeBuffer cb(name(), new_total_cap, 0);
+ cb.set_const_section_alignment(_const_section_alignment);
if (cb.blob() == nullptr) {
// Failed to allocate in code cache.
free_blob();
diff --git a/src/hotspot/share/asm/register.hpp b/src/hotspot/share/asm/register.hpp
index 72a27085a50..f406995b8ac 100644
--- a/src/hotspot/share/asm/register.hpp
+++ b/src/hotspot/share/asm/register.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/c1/c1_Canonicalizer.cpp b/src/hotspot/share/c1/c1_Canonicalizer.cpp
index 8c15c481e18..fd72d656cae 100644
--- a/src/hotspot/share/c1/c1_Canonicalizer.cpp
+++ b/src/hotspot/share/c1/c1_Canonicalizer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/c1/c1_FrameMap.cpp b/src/hotspot/share/c1/c1_FrameMap.cpp
index fe70c0b31f6..2065a31f752 100644
--- a/src/hotspot/share/c1/c1_FrameMap.cpp
+++ b/src/hotspot/share/c1/c1_FrameMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/c1/c1_GraphBuilder.hpp b/src/hotspot/share/c1/c1_GraphBuilder.hpp
index b6e87c3e4ed..4dfb23422e7 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.hpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/c1/c1_IR.hpp b/src/hotspot/share/c1/c1_IR.hpp
index c9ecdd198f9..74521d12f41 100644
--- a/src/hotspot/share/c1/c1_IR.hpp
+++ b/src/hotspot/share/c1/c1_IR.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index 27c9f8e48ca..3b04b1fe76a 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cds/cdsProtectionDomain.hpp b/src/hotspot/share/cds/cdsProtectionDomain.hpp
index baab4ab0e72..8eaec96f9fd 100644
--- a/src/hotspot/share/cds/cdsProtectionDomain.hpp
+++ b/src/hotspot/share/cds/cdsProtectionDomain.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index 899695fd625..edb5a81ca1c 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cds/cppVtables.hpp b/src/hotspot/share/cds/cppVtables.hpp
index 973502909dd..b40ca036023 100644
--- a/src/hotspot/share/cds/cppVtables.hpp
+++ b/src/hotspot/share/cds/cppVtables.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index a419f158ffb..d03da9c49ad 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -147,15 +147,16 @@ size_t MetaspaceShared::core_region_alignment() {
}
static bool shared_base_valid(char* shared_base) {
- // We check user input for SharedBaseAddress at dump time. We must weed out values
- // we already know to be invalid later.
+ // We check user input for SharedBaseAddress at dump time.
// At CDS runtime, "shared_base" will be the (attempted) mapping start. It will also
// be the encoding base, since the the headers of archived base objects (and with Lilliput,
// the prototype mark words) carry pre-computed narrow Klass IDs that refer to the mapping
// start as base.
//
- // Therefore, "shared_base" must be later usable as encoding base.
+ // On AARCH64, The "shared_base" may not be later usable as encoding base, depending on the
+ // total size of the reserved area and the precomputed_narrow_klass_shift. This is checked
+ // before reserving memory. Here we weed out values already known to be invalid later.
return AARCH64_ONLY(is_aligned(shared_base, 4 * G)) NOT_AARCH64(true);
}
@@ -1492,6 +1493,15 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
const size_t total_range_size =
archive_space_size + gap_size + class_space_size;
+ // Test that class space base address plus shift can be decoded by aarch64, when restored.
+ const int precomputed_narrow_klass_shift = ArchiveBuilder::precomputed_narrow_klass_shift();
+ if (!CompressedKlassPointers::check_klass_decode_mode(base_address, precomputed_narrow_klass_shift,
+ total_range_size)) {
+ log_info(cds)("CDS initialization: Cannot use SharedBaseAddress " PTR_FORMAT " with precomputed shift %d.",
+ p2i(base_address), precomputed_narrow_klass_shift);
+ use_archive_base_addr = false;
+ }
+
assert(total_range_size > ccs_begin_offset, "must be");
if (use_windows_memory_mapping() && use_archive_base_addr) {
if (base_address != nullptr) {
@@ -1531,7 +1541,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
}
// Paranoid checks:
- assert(base_address == nullptr || (address)total_space_rs.base() == base_address,
+ assert(!use_archive_base_addr || (address)total_space_rs.base() == base_address,
"Sanity (" PTR_FORMAT " vs " PTR_FORMAT ")", p2i(base_address), p2i(total_space_rs.base()));
assert(is_aligned(total_space_rs.base(), base_address_alignment), "Sanity");
assert(total_space_rs.size() == total_range_size, "Sanity");
diff --git a/src/hotspot/share/cds/runTimeClassInfo.cpp b/src/hotspot/share/cds/runTimeClassInfo.cpp
index 0acd89b5bce..e2d41cd1de2 100644
--- a/src/hotspot/share/cds/runTimeClassInfo.cpp
+++ b/src/hotspot/share/cds/runTimeClassInfo.cpp
@@ -76,10 +76,13 @@ void RunTimeClassInfo::init(DumpTimeClassInfo& info) {
}
InstanceKlass* RunTimeClassInfo::klass() const {
- if (ArchiveBuilder::is_active() && ArchiveBuilder::current()->is_in_buffer_space((address)this)) {
- return ArchiveBuilder::current()->offset_to_buffered<InstanceKlass*>(_klass_offset);
- } else {
+ if (MetaspaceShared::is_in_shared_metaspace(this)) {
+ // <this> is inside a mmaped CDS archive.
return ArchiveUtils::offset_to_archived_address<InstanceKlass*>(_klass_offset);
+ } else {
+ // <this> is a temporary copy of a RunTimeClassInfo that's being initialized
+ // by the ArchiveBuilder.
+ return ArchiveBuilder::current()->offset_to_buffered<InstanceKlass*>(_klass_offset);
}
}
diff --git a/src/hotspot/share/cds/serializeClosure.hpp b/src/hotspot/share/cds/serializeClosure.hpp
index 3d401407f37..a6991b0d5c0 100644
--- a/src/hotspot/share/cds/serializeClosure.hpp
+++ b/src/hotspot/share/cds/serializeClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/cds/unregisteredClasses.cpp b/src/hotspot/share/cds/unregisteredClasses.cpp
index d23ca8903e9..2aeb2fc94e7 100644
--- a/src/hotspot/share/cds/unregisteredClasses.cpp
+++ b/src/hotspot/share/cds/unregisteredClasses.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp
index d7b5118be15..45d569ce2ea 100644
--- a/src/hotspot/share/ci/ciObjectFactory.cpp
+++ b/src/hotspot/share/ci/ciObjectFactory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/ci/ciTypeArrayKlass.cpp b/src/hotspot/share/ci/ciTypeArrayKlass.cpp
index 11aef8b57e6..6a5d5faadc6 100644
--- a/src/hotspot/share/ci/ciTypeArrayKlass.cpp
+++ b/src/hotspot/share/ci/ciTypeArrayKlass.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/ci/ciTypeFlow.cpp b/src/hotspot/share/ci/ciTypeFlow.cpp
index 071a6bcfc2e..081fea95278 100644
--- a/src/hotspot/share/ci/ciTypeFlow.cpp
+++ b/src/hotspot/share/ci/ciTypeFlow.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/classFileError.cpp b/src/hotspot/share/classfile/classFileError.cpp
index f6bac278e60..901bda5eea3 100644
--- a/src/hotspot/share/classfile/classFileError.cpp
+++ b/src/hotspot/share/classfile/classFileError.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
index a79c6e21089..49f15e8af33 100644
--- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/classLoaderStats.cpp b/src/hotspot/share/classfile/classLoaderStats.cpp
index 6bb49c3a853..5fbd4ce00d9 100644
--- a/src/hotspot/share/classfile/classLoaderStats.cpp
+++ b/src/hotspot/share/classfile/classLoaderStats.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp
index 57991589fdc..2df8d47a3f4 100644
--- a/src/hotspot/share/classfile/compactHashtable.cpp
+++ b/src/hotspot/share/classfile/compactHashtable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp
index f27f1feba6d..682806b8f3d 100644
--- a/src/hotspot/share/classfile/javaClasses.inline.hpp
+++ b/src/hotspot/share/classfile/javaClasses.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/javaClassesImpl.hpp b/src/hotspot/share/classfile/javaClassesImpl.hpp
index 235334a388b..5f4df9391e3 100644
--- a/src/hotspot/share/classfile/javaClassesImpl.hpp
+++ b/src/hotspot/share/classfile/javaClassesImpl.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/moduleEntry.hpp b/src/hotspot/share/classfile/moduleEntry.hpp
index 48adc41eddc..1100dbf8570 100644
--- a/src/hotspot/share/classfile/moduleEntry.hpp
+++ b/src/hotspot/share/classfile/moduleEntry.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index 9c430e77d09..7e26febda89 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -723,8 +723,7 @@ const char* Modules::get_numbered_property_as_sorted_string(const char* property
}
}
- const char* result = (const char*)os::strdup(st.as_string()); // Example: "java.base,java.compiler"
- return strcmp(result, "") != 0 ? result : nullptr;
+ return (st.size() > 0) ? os::strdup(st.as_string()) : nullptr; // Example: "java.base,java.compiler"
}
void Modules::define_archived_modules(Handle h_platform_loader, Handle h_system_loader, TRAPS) {
diff --git a/src/hotspot/share/classfile/resolutionErrors.cpp b/src/hotspot/share/classfile/resolutionErrors.cpp
index cf598df59d7..1f2e75e9257 100644
--- a/src/hotspot/share/classfile/resolutionErrors.cpp
+++ b/src/hotspot/share/classfile/resolutionErrors.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/resolutionErrors.hpp b/src/hotspot/share/classfile/resolutionErrors.hpp
index 7eff7816b2e..60f8aea68ef 100644
--- a/src/hotspot/share/classfile/resolutionErrors.hpp
+++ b/src/hotspot/share/classfile/resolutionErrors.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 84b7ea0d6b9..180ba73e681 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -957,11 +957,17 @@ InstanceKlass* SystemDictionaryShared::get_shared_lambda_proxy_class(InstanceKla
Symbol* method_type,
Method* member_method,
Symbol* instantiated_method_type) {
+ assert(caller_ik != nullptr, "sanity");
+ assert(invoked_name != nullptr, "sanity");
+ assert(invoked_type != nullptr, "sanity");
+ assert(method_type != nullptr, "sanity");
+ assert(instantiated_method_type != nullptr, "sanity");
+
if (!caller_ik->is_shared() ||
!invoked_name->is_shared() ||
!invoked_type->is_shared() ||
!method_type->is_shared() ||
- !member_method->is_shared() ||
+ (member_method != nullptr && !member_method->is_shared()) ||
!instantiated_method_type->is_shared()) {
// These can't be represented as u4 offset, but we wouldn't have archived a lambda proxy in this case anyway.
return nullptr;
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 75c5a55bb8d..dcdb19631cd 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -1017,33 +1017,6 @@ class methodHandle;
"Ljdk/internal/vm/vector/VectorSupport$VectorPayload;") \
do_name(vector_frombits_coerced_name, "fromBitsCoerced") \
\
- do_intrinsic(_VectorShuffleIota, jdk_internal_vm_vector_VectorSupport, vector_shuffle_step_iota_name, vector_shuffle_step_iota_sig, F_S) \
- do_signature(vector_shuffle_step_iota_sig, "(Ljava/lang/Class;" \
- "Ljava/lang/Class;" \
- "Ljdk/internal/vm/vector/VectorSupport$VectorSpecies;" \
- "IIII" \
- "Ljdk/internal/vm/vector/VectorSupport$ShuffleIotaOperation;)" \
- "Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;") \
- do_name(vector_shuffle_step_iota_name, "shuffleIota") \
- \
- do_intrinsic(_VectorShuffleToVector, jdk_internal_vm_vector_VectorSupport, vector_shuffle_to_vector_name, vector_shuffle_to_vector_sig, F_S) \
- do_signature(vector_shuffle_to_vector_sig, "(Ljava/lang/Class;" \
- "Ljava/lang/Class;" \
- "Ljava/lang/Class;" \
- "Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;" \
- "ILjdk/internal/vm/vector/VectorSupport$ShuffleToVectorOperation;)" \
- "Ljdk/internal/vm/vector/VectorSupport$Vector;") \
- do_name(vector_shuffle_to_vector_name, "shuffleToVector") \
- \
- do_intrinsic(_VectorWrapShuffleIndexes, jdk_internal_vm_vector_VectorSupport, vector_wrap_shuffle_indexes_name, \
- vector_wrap_shuffle_indexes_sig, F_S) \
- do_signature(vector_wrap_shuffle_indexes_sig, "(Ljava/lang/Class;" \
- "Ljava/lang/Class;" \
- "Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;" \
- "ILjdk/internal/vm/vector/VectorSupport$WrapShuffleIndexesOperation;)" \
- "Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;") \
- do_name(vector_wrap_shuffle_indexes_name, "wrapShuffleIndexes") \
- \
do_intrinsic(_VectorLoadOp, jdk_internal_vm_vector_VectorSupport, vector_load_op_name, vector_load_op_sig, F_S) \
do_signature(vector_load_op_sig, "(Ljava/lang/Class;" \
"Ljava/lang/Class;" \
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index f0769e240dd..a0a02c25158 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -433,7 +433,7 @@ void CodeCache::add_heap(ReservedSpace rs, const char* name, CodeBlobType code_b
// Reserve Space
size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size());
- size_initial = align_up(size_initial, os::vm_page_size());
+ size_initial = align_up(size_initial, rs.page_size());
if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
vm_exit_during_initialization(err_msg("Could not reserve enough space in %s (" SIZE_FORMAT "K)",
heap->name(), size_initial/K));
diff --git a/src/hotspot/share/code/codeCache.inline.hpp b/src/hotspot/share/code/codeCache.inline.hpp
index 5ab7187cd26..1f7511940d0 100644
--- a/src/hotspot/share/code/codeCache.inline.hpp
+++ b/src/hotspot/share/code/codeCache.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/code/codeHeapState.cpp b/src/hotspot/share/code/codeHeapState.cpp
index 1ea3f258dd2..0fa7c7386c7 100644
--- a/src/hotspot/share/code/codeHeapState.cpp
+++ b/src/hotspot/share/code/codeHeapState.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/code/stubs.cpp b/src/hotspot/share/code/stubs.cpp
index 69195c3ecb7..95cee4edb43 100644
--- a/src/hotspot/share/code/stubs.cpp
+++ b/src/hotspot/share/code/stubs.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/code/stubs.hpp b/src/hotspot/share/code/stubs.hpp
index c448e0bddfa..f7564ef4251 100644
--- a/src/hotspot/share/code/stubs.hpp
+++ b/src/hotspot/share/code/stubs.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/code/vmreg.cpp b/src/hotspot/share/code/vmreg.cpp
index ba30c114c6c..b9ee4a6b3e7 100644
--- a/src/hotspot/share/code/vmreg.cpp
+++ b/src/hotspot/share/code/vmreg.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/code/vmreg.hpp b/src/hotspot/share/code/vmreg.hpp
index 41e40e9a017..ae4e477b8cd 100644
--- a/src/hotspot/share/code/vmreg.hpp
+++ b/src/hotspot/share/code/vmreg.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/code/vtableStubs.cpp b/src/hotspot/share/code/vtableStubs.cpp
index c3aaa732546..9335390d30e 100644
--- a/src/hotspot/share/code/vtableStubs.cpp
+++ b/src/hotspot/share/code/vtableStubs.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/compiler/compilationMemoryStatistic.hpp b/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
index d669cc14722..d9cbfabde1b 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Red Hat, Inc. and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp
index 5fa0222b636..f6067f75d32 100644
--- a/src/hotspot/share/compiler/compileBroker.hpp
+++ b/src/hotspot/share/compiler/compileBroker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/compiler/oopMap.inline.hpp b/src/hotspot/share/compiler/oopMap.inline.hpp
index 05ef53f8231..44d553be1fd 100644
--- a/src/hotspot/share/compiler/oopMap.inline.hpp
+++ b/src/hotspot/share/compiler/oopMap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
index 5d6a0100f7f..c60f9dff81b 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/c2/g1BarrierSetC2.hpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
index c0f036930da..198cabec1db 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1AllocRegion.cpp b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
index b06f8fd3223..a0a2b31ed6a 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1AllocRegion.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
index 4d2d18dd6b8..3e38332ee6f 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
index 457a83f4285..af9156163ac 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp
index 29ce8e26bbb..be8c39ba440 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp
index f9038071bd9..26b1f9996b5 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
index ff84306e74f..7595efab3c1 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1AnalyticsSequences.hpp b/src/hotspot/share/gc/g1/g1AnalyticsSequences.hpp
index dbd13d29b78..1c5924f027e 100644
--- a/src/hotspot/share/gc/g1/g1AnalyticsSequences.hpp
+++ b/src/hotspot/share/gc/g1/g1AnalyticsSequences.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1AnalyticsSequences.inline.hpp b/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
index 02a54e2a035..cd59cac80b4 100644
--- a/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1Arguments.hpp b/src/hotspot/share/gc/g1/g1Arguments.hpp
index 73fa0557f7d..6fc8349ad65 100644
--- a/src/hotspot/share/gc/g1/g1Arguments.hpp
+++ b/src/hotspot/share/gc/g1/g1Arguments.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
index 019cfb8cb98..4eb3fcf600b 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index 6984fcc4953..3212aec2780 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index 2fcbd5a1731..a032f072aed 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1BarrierSetRuntime.cpp b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp
index 2e247f46c93..ab67321242e 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1BarrierSetRuntime.hpp b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp
index f98e94096e7..27287a0624b 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1BlockOffsetTable.cpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
index ff66c2af409..a8c55874318 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
@@ -27,9 +27,14 @@
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1HeapRegion.inline.hpp"
#include "logging/log.hpp"
-#include "nmt/memTracker.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
+#include "runtime/os.hpp"
+
+size_t G1BlockOffsetTable::compute_size(size_t mem_region_words) {
+ size_t number_of_slots = (mem_region_words / CardTable::card_size_in_words());
+ return os::align_up_vm_allocation_granularity(number_of_slots);
+}
G1BlockOffsetTable::G1BlockOffsetTable(MemRegion heap, G1RegionToSpaceMapper* storage) :
_reserved(heap), _offset_base(nullptr) {
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
index 4b254c7e42a..e0454d803f1 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
@@ -29,7 +29,6 @@
#include "gc/shared/blockOffsetTable.hpp"
#include "gc/shared/cardTable.hpp"
#include "memory/memRegion.hpp"
-#include "memory/virtualspace.hpp"
#include "utilities/globalDefinitions.hpp"
// This implementation of "G1BlockOffsetTable" divides the covered region
@@ -90,10 +89,7 @@ class G1BlockOffsetTable: public CHeapObj<mtGC> {
// Return the number of slots needed for an offset array
// that covers mem_region_words words.
- static size_t compute_size(size_t mem_region_words) {
- size_t number_of_slots = (mem_region_words / CardTable::card_size_in_words());
- return ReservedSpace::allocation_align_size_up(number_of_slots);
- }
+ static size_t compute_size(size_t mem_region_words);
// Returns how many bytes of the heap a single byte of the BOT corresponds to.
static size_t heap_map_factor() {
diff --git a/src/hotspot/share/gc/g1/g1CardSet.hpp b/src/hotspot/share/gc/g1/g1CardSet.hpp
index 22530ddadaf..9cefc4b1c22 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1CardSetContainers.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
index 94ca13b0a33..61707dcf012 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1CardTable.cpp b/src/hotspot/share/gc/g1/g1CardTable.cpp
index 56352865e37..fa8203a1f58 100644
--- a/src/hotspot/share/gc/g1/g1CardTable.cpp
+++ b/src/hotspot/share/gc/g1/g1CardTable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/g1/g1CollectedHeap.inline.hpp"
#include "gc/shared/memset_with_concurrent_readers.hpp"
#include "logging/log.hpp"
+#include "runtime/os.hpp"
void G1CardTable::g1_mark_as_young(const MemRegion& mr) {
CardValue *const first = byte_for(mr.start());
@@ -47,6 +48,11 @@ void G1CardTableChangedListener::on_commit(uint start_idx, size_t num_regions, b
_card_table->clear_MemRegion(mr);
}
+size_t G1CardTable::compute_size(size_t mem_region_size_in_words) {
+ size_t number_of_slots = (mem_region_size_in_words / _card_size_in_words);
+ return os::align_up_vm_allocation_granularity(number_of_slots);
+}
+
void G1CardTable::initialize(G1RegionToSpaceMapper* mapper) {
mapper->set_mapping_changed_listener(&_listener);
diff --git a/src/hotspot/share/gc/g1/g1CardTable.hpp b/src/hotspot/share/gc/g1/g1CardTable.hpp
index 9d4370d27ff..16133029a11 100644
--- a/src/hotspot/share/gc/g1/g1CardTable.hpp
+++ b/src/hotspot/share/gc/g1/g1CardTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,10 +107,7 @@ class G1CardTable : public CardTable {
inline uint region_idx_for(CardValue* p);
- static size_t compute_size(size_t mem_region_size_in_words) {
- size_t number_of_slots = (mem_region_size_in_words / _card_size_in_words);
- return ReservedSpace::allocation_align_size_up(number_of_slots);
- }
+ static size_t compute_size(size_t mem_region_size_in_words);
// Returns how many bytes of the heap a single byte of the Card Table corresponds to.
static size_t heap_map_factor() { return _card_size; }
diff --git a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp
index 295eea242f7..03bce7d50d7 100644
--- a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1CardTableEntryClosure.hpp b/src/hotspot/share/gc/g1/g1CardTableEntryClosure.hpp
index e2b53d69e06..88a7f7efad4 100644
--- a/src/hotspot/share/gc/g1/g1CardTableEntryClosure.hpp
+++ b/src/hotspot/share/gc/g1/g1CardTableEntryClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1CodeRootSet.hpp b/src/hotspot/share/gc/g1/g1CodeRootSet.hpp
index 01de2ec48ff..ffa1cddbe54 100644
--- a/src/hotspot/share/gc/g1/g1CodeRootSet.hpp
+++ b/src/hotspot/share/gc/g1/g1CodeRootSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 188ce354dd5..9c9ef7ff9ee 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -991,7 +991,7 @@ HeapWord* G1CollectedHeap::expand_and_allocate(size_t word_size) {
}
bool G1CollectedHeap::expand(size_t expand_bytes, WorkerThreads* pretouch_workers, double* expand_time_ms) {
- size_t aligned_expand_bytes = ReservedSpace::page_align_size_up(expand_bytes);
+ size_t aligned_expand_bytes = os::align_up_vm_page_size(expand_bytes);
aligned_expand_bytes = align_up(aligned_expand_bytes, G1HeapRegion::GrainBytes);
log_debug(gc, ergo, heap)("Expand the heap. requested expansion amount: " SIZE_FORMAT "B expansion amount: " SIZE_FORMAT "B",
@@ -1034,8 +1034,7 @@ bool G1CollectedHeap::expand_single_region(uint node_index) {
}
void G1CollectedHeap::shrink_helper(size_t shrink_bytes) {
- size_t aligned_shrink_bytes =
- ReservedSpace::page_align_size_down(shrink_bytes);
+ size_t aligned_shrink_bytes = os::align_down_vm_page_size(shrink_bytes);
aligned_shrink_bytes = align_down(aligned_shrink_bytes, G1HeapRegion::GrainBytes);
uint num_regions_to_remove = (uint)(shrink_bytes / G1HeapRegion::GrainBytes);
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
index 809f1ce9ce8..05e6457c095 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1CollectionSetCandidates.inline.hpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.inline.hpp
index 9d602ace8c3..cc2c24fbba0 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1CollectionSetChooser.hpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp
index f49287f823b..691017b9d87 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
index 7b9be48d9b5..039169794c5 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1ConcurrentMarkBitMap.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp
index b76ab6b867c..d4200edcdcb 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1ConcurrentMarkBitMap.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp
index 6a141a7919b..a976f7050a4 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
index ebf06be94c8..ee1b1d6555a 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp
index b2bb5c73ad5..b016ff87adc 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1DirtyCardQueue.cpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp
index cc23e0dabe5..96c212bd2ed 100644
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1DirtyCardQueue.hpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
index 1dd3a9aface..ce2f88c9b48 100644
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1EdenRegions.hpp b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
index ef37619c140..81d02381c9b 100644
--- a/src/hotspot/share/gc/g1/g1EdenRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1EvacStats.inline.hpp b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
index d4cae1f9836..123ce92cb1d 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullCollector.hpp b/src/hotspot/share/gc/g1/g1FullCollector.hpp
index 11effe85993..b39acf7c0dd 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.hpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullCollector.inline.hpp b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp
index 1a8d6257961..106f88e7d0d 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, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCCompactionPoint.hpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp
index 43131f9092d..5444864ba5e 100644
--- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCMarkTask.cpp b/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp
index 6a38bc35f4f..288331b398f 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCMarkTask.hpp b/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp
index cf87bcfa7c8..8bb810e1d4f 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCMarker.cpp b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
index b98bb41240c..8fcc957b168 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCMarker.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp
index 3dcc746a26e..b1b750eae90 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCMarker.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
index 646cf9e3df5..6cbfe2674e8 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCPrepareTask.cpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
index 88460a07f44..bed17e91ae9 100644
--- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCResetMetadataTask.cpp b/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.cpp
index 910f878ef7f..2022ff79525 100644
--- a/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCScope.cpp b/src/hotspot/share/gc/g1/g1FullGCScope.cpp
index e0e79e8b60b..9352b7df2d9 100644
--- a/src/hotspot/share/gc/g1/g1FullGCScope.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCScope.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1FullGCScope.hpp b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
index ab3b99fea04..f7362d20d4f 100644
--- a/src/hotspot/share/gc/g1/g1FullGCScope.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1HeapRegionAttr.hpp b/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp
index 7ac688641cd..6d9bcea0343 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1HeapSizingPolicy.cpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
index a7b08a6a5c9..0b7db7836d6 100644
--- a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1HeapTransition.hpp b/src/hotspot/share/gc/g1/g1HeapTransition.hpp
index 54f87fd3b71..18bcd153505 100644
--- a/src/hotspot/share/gc/g1/g1HeapTransition.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapTransition.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1HeapVerifier.hpp b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp
index 39246237ba3..d4ab4c60214 100644
--- a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1IHOPControl.cpp b/src/hotspot/share/gc/g1/g1IHOPControl.cpp
index d1bfcf0d095..db8426d9401 100644
--- a/src/hotspot/share/gc/g1/g1IHOPControl.cpp
+++ b/src/hotspot/share/gc/g1/g1IHOPControl.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1MemoryPool.cpp b/src/hotspot/share/gc/g1/g1MemoryPool.cpp
index f924e5a7e65..ccff8481926 100644
--- a/src/hotspot/share/gc/g1/g1MemoryPool.cpp
+++ b/src/hotspot/share/gc/g1/g1MemoryPool.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1MonitoringSupport.cpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
index febb27fb43c..203ef473fa2 100644
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1MonitoringSupport.hpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
index a1b9d6c985b..1f62b53d97c 100644
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp
index d55c844037c..2ededdfb8d2 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1NMethodClosure.cpp b/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
index 1574ded4aa1..379b1f935e1 100644
--- a/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
+++ b/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1NMethodClosure.hpp b/src/hotspot/share/gc/g1/g1NMethodClosure.hpp
index f8872b533ab..91906932d4f 100644
--- a/src/hotspot/share/gc/g1/g1NMethodClosure.hpp
+++ b/src/hotspot/share/gc/g1/g1NMethodClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
index bdb732f6ebb..41c4fc3a34c 100644
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1ParScanThreadState.inline.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
index a164fa34929..f96a2400739 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index 9a6ffb570be..6fcc3ed6b30 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1Predictions.hpp b/src/hotspot/share/gc/g1/g1Predictions.hpp
index ae2a8f41880..0e299168278 100644
--- a/src/hotspot/share/gc/g1/g1Predictions.hpp
+++ b/src/hotspot/share/gc/g1/g1Predictions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RedirtyCardsQueue.cpp b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp
index 35e80fb262e..59501447878 100644
--- a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp
+++ b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RedirtyCardsQueue.hpp b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp
index ca0bc35fd04..add66f24cca 100644
--- a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp
+++ b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RegionMarkStatsCache.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
index f74453b81ce..fe3c16c729a 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RegionsOnNodes.cpp b/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp
index 4a81b529e7b..b72d3687c67 100644
--- a/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp
+++ b/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RegionsOnNodes.hpp b/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
index 2ab4950a25c..d5318343399 100644
--- a/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RemSetTrackingPolicy.cpp b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp
index 21b188c00c2..6538dffd998 100644
--- a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RemSetTrackingPolicy.hpp b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp
index a89c24e6f4e..572868becf1 100644
--- a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp
+++ b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RootClosures.cpp b/src/hotspot/share/gc/g1/g1RootClosures.cpp
index 9d64bc76fd6..7acc3adc836 100644
--- a/src/hotspot/share/gc/g1/g1RootClosures.cpp
+++ b/src/hotspot/share/gc/g1/g1RootClosures.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RootClosures.hpp b/src/hotspot/share/gc/g1/g1RootClosures.hpp
index 7ada501074d..35ce038e1f8 100644
--- a/src/hotspot/share/gc/g1/g1RootClosures.hpp
+++ b/src/hotspot/share/gc/g1/g1RootClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RootProcessor.cpp b/src/hotspot/share/gc/g1/g1RootProcessor.cpp
index 140e8408e52..07ae66cfb0b 100644
--- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1RootProcessor.hpp b/src/hotspot/share/gc/g1/g1RootProcessor.hpp
index cf4fdc3c263..2313fd62f20 100644
--- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1SATBMarkQueueSet.cpp b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp
index 7531e5e1141..17a0f9326b5 100644
--- a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp
+++ b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1SharedClosures.hpp b/src/hotspot/share/gc/g1/g1SharedClosures.hpp
index 80f1389e7d8..5541d6274a3 100644
--- a/src/hotspot/share/gc/g1/g1SharedClosures.hpp
+++ b/src/hotspot/share/gc/g1/g1SharedClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1SurvRateGroup.cpp b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
index 52e4033fd43..40f15446fec 100644
--- a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
+++ b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1SurvRateGroup.hpp b/src/hotspot/share/gc/g1/g1SurvRateGroup.hpp
index 5522555f24a..6b83644b403 100644
--- a/src/hotspot/share/gc/g1/g1SurvRateGroup.hpp
+++ b/src/hotspot/share/gc/g1/g1SurvRateGroup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1SurvivorRegions.cpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
index b08563bb7e5..53febea0a49 100644
--- a/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
+++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1SurvivorRegions.hpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
index daedbd35d7a..cc6bbc44fa8 100644
--- a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1UncommitRegionTask.cpp b/src/hotspot/share/gc/g1/g1UncommitRegionTask.cpp
index 8d194063789..31ca32d9ea2 100644
--- a/src/hotspot/share/gc/g1/g1UncommitRegionTask.cpp
+++ b/src/hotspot/share/gc/g1/g1UncommitRegionTask.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1VMOperations.cpp b/src/hotspot/share/gc/g1/g1VMOperations.cpp
index 11702c98416..634cdf6265f 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1YoungCollector.hpp b/src/hotspot/share/gc/g1/g1YoungCollector.hpp
index 260880e2d8c..d6835389801 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1YoungGCPreEvacuateTasks.hpp b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.hpp
index 912941fa2a2..791031d979f 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/g1/g1YoungGenSizer.cpp b/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp
index f4daf30eb56..0c4b0b90df0 100644
--- a/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/gcAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
index e21d568955a..eb792788376 100644
--- a/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
+++ b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index f261f42924e..06aa3d5fc72 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index b48b1ebcc9f..4583be0e1ea 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/parMarkBitMap.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
index ecfc637312c..4c3cc39edec 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/parMarkBitMap.inline.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp
index 5cc7b304c99..939583c9abc 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 52d031b6dd2..f2693349b1f 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -70,8 +70,8 @@ jint ParallelScavengeHeap::initialize() {
initialize_reserved_region(heap_rs);
// Layout the reserved space for the generations.
- ReservedSpace old_rs = heap_rs.first_part(MaxOldSize);
- ReservedSpace young_rs = heap_rs.last_part(MaxOldSize);
+ ReservedSpace old_rs = heap_rs.first_part(MaxOldSize, GenAlignment);
+ ReservedSpace young_rs = heap_rs.last_part(MaxOldSize, GenAlignment);
assert(young_rs.size() == MaxNewSize, "Didn't reserve all of the heap");
PSCardTable* card_table = new PSCardTable(heap_rs.region());
diff --git a/src/hotspot/share/gc/parallel/psCardTable.cpp b/src/hotspot/share/gc/parallel/psCardTable.cpp
index 345d81ed147..b80a1b13b00 100644
--- a/src/hotspot/share/gc/parallel/psCardTable.cpp
+++ b/src/hotspot/share/gc/parallel/psCardTable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
index d36f18826e7..063b2f21728 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
index da1609a32d8..cd4eefe775b 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
index 0b928622238..94529d27423 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index 09481d8ddde..6fc86eb2d29 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index dc557590f51..c1c9561f716 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -2138,13 +2138,9 @@ size_t PSParallelCompact::next_src_region(MoveAndUpdateClosure& closure,
}
if (src_region_ptr < top_region_ptr) {
- // The next source region is in the current space. Update src_region_idx
- // and the source address to match src_region_ptr.
+ // Found the first non-empty region in the same space.
src_region_idx = sd.region(src_region_ptr);
- HeapWord* const src_region_addr = sd.region_to_addr(src_region_idx);
- if (src_region_addr > closure.source()) {
- closure.set_source(src_region_addr);
- }
+ closure.set_source(sd.region_to_addr(src_region_idx));
return src_region_idx;
}
@@ -2168,13 +2164,10 @@ size_t PSParallelCompact::next_src_region(MoveAndUpdateClosure& closure,
RegionData* cur = sd.region(cur_region);
if (cur->live_obj_size() > 0) {
HeapWord* region_start_addr = sd.region_to_addr(cur_region);
- HeapWord* region_end_addr = region_start_addr + ParallelCompactData::RegionSize;
- HeapWord* first_live_word = mark_bitmap()->find_obj_beg(region_start_addr, region_end_addr);
- assert(first_live_word < region_end_addr, "inv");
src_space_id = SpaceId(space_id);
src_space_top = top;
- closure.set_source(first_live_word);
+ closure.set_source(region_start_addr);
return cur_region;
}
}
diff --git a/src/hotspot/share/gc/parallel/psVMOperations.cpp b/src/hotspot/share/gc/parallel/psVMOperations.cpp
index f7e00449f5c..d4d2e1df21f 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.cpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/parallel/psVMOperations.hpp b/src/hotspot/share/gc/parallel/psVMOperations.hpp
index e473ebc49ca..ba896de8680 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.hpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/serial/serialBlockOffsetTable.cpp b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
index 7ac0fcc8b53..8d257c0bf33 100644
--- a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
@@ -32,6 +32,16 @@
#include "nmt/memTracker.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
+#include "runtime/os.hpp"
+
+// Return the number of slots needed for an offset array
+// that covers mem_region_words words.
+size_t SerialBlockOffsetTable::compute_size(size_t mem_region_words) {
+ assert(mem_region_words % CardTable::card_size_in_words() == 0, "precondition");
+
+ size_t number_of_slots = mem_region_words / CardTable::card_size_in_words();
+ return os::align_up_vm_allocation_granularity(number_of_slots);
+}
SerialBlockOffsetTable::SerialBlockOffsetTable(MemRegion reserved,
size_t init_word_size):
@@ -61,14 +71,14 @@ void SerialBlockOffsetTable::resize(size_t new_word_size) {
size_t delta;
char* high = _vs.high();
if (new_size > old_size) {
- delta = ReservedSpace::page_align_size_up(new_size - old_size);
+ delta = os::align_up_vm_page_size(new_size - old_size);
assert(delta > 0, "just checking");
if (!_vs.expand_by(delta)) {
vm_exit_out_of_memory(delta, OOM_MMAP_ERROR, "offset table expansion");
}
assert(_vs.high() == high + delta, "invalid expansion");
} else {
- delta = ReservedSpace::page_align_size_down(old_size - new_size);
+ delta = os::align_down_vm_page_size(old_size - new_size);
if (delta == 0) return;
_vs.shrink_by(delta);
assert(_vs.high() == high - delta, "invalid expansion");
diff --git a/src/hotspot/share/gc/serial/serialBlockOffsetTable.hpp b/src/hotspot/share/gc/serial/serialBlockOffsetTable.hpp
index 26364610559..5da8f7b47a4 100644
--- a/src/hotspot/share/gc/serial/serialBlockOffsetTable.hpp
+++ b/src/hotspot/share/gc/serial/serialBlockOffsetTable.hpp
@@ -55,12 +55,7 @@ class SerialBlockOffsetTable: public CHeapObj<mtGC> {
// Return the number of slots needed for an offset array
// that covers mem_region_words words.
- static size_t compute_size(size_t mem_region_words) {
- assert(mem_region_words % CardTable::card_size_in_words() == 0, "precondition");
-
- size_t number_of_slots = mem_region_words / CardTable::card_size_in_words();
- return ReservedSpace::allocation_align_size_up(number_of_slots);
- }
+ static size_t compute_size(size_t mem_region_words);
// Mapping from address to object start array entry.
uint8_t* entry_for_addr(const void* const p) const;
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index f5e6a46df29..81cc59146da 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -186,8 +186,8 @@ jint SerialHeap::initialize() {
initialize_reserved_region(heap_rs);
- ReservedSpace young_rs = heap_rs.first_part(MaxNewSize);
- ReservedSpace old_rs = heap_rs.last_part(MaxNewSize);
+ ReservedSpace young_rs = heap_rs.first_part(MaxNewSize, GenAlignment);
+ ReservedSpace old_rs = heap_rs.last_part(MaxNewSize, GenAlignment);
_rem_set = new CardTableRS(heap_rs.region());
_rem_set->initialize(young_rs.base(), old_rs.base());
diff --git a/src/hotspot/share/gc/serial/serialHeap.inline.hpp b/src/hotspot/share/gc/serial/serialHeap.inline.hpp
index d43f95cddcf..cc8bf5e8f32 100644
--- a/src/hotspot/share/gc/serial/serialHeap.inline.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index a00eb369980..2b7711e9b0a 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -80,7 +80,7 @@ bool TenuredGeneration::expand(size_t bytes, size_t expand_bytes) {
if (bytes == 0) {
return true; // That's what grow_by(0) would return
}
- size_t aligned_bytes = ReservedSpace::page_align_size_up(bytes);
+ size_t aligned_bytes = os::align_up_vm_page_size(bytes);
if (aligned_bytes == 0){
// The alignment caused the number of bytes to wrap. An expand_by(0) will
// return true with the implication that an expansion was done when it
@@ -88,9 +88,9 @@ bool TenuredGeneration::expand(size_t bytes, size_t expand_bytes) {
// but not a guarantee. Align down to give a best effort. This is likely
// the most that the generation can expand since it has some capacity to
// start with.
- aligned_bytes = ReservedSpace::page_align_size_down(bytes);
+ aligned_bytes = os::align_down_vm_page_size(bytes);
}
- size_t aligned_expand_bytes = ReservedSpace::page_align_size_up(expand_bytes);
+ size_t aligned_expand_bytes = os::align_up_vm_page_size(expand_bytes);
bool success = false;
if (aligned_expand_bytes > aligned_bytes) {
success = grow_by(aligned_expand_bytes);
@@ -122,7 +122,7 @@ bool TenuredGeneration::grow_to_reserved() {
void TenuredGeneration::shrink(size_t bytes) {
assert_correct_size_change_locking();
- size_t size = ReservedSpace::page_align_size_down(bytes);
+ size_t size = os::align_down_vm_page_size(bytes);
if (size == 0) {
return;
}
diff --git a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
index a9c11af570c..37dac1a4ee6 100644
--- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
+++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/ageTable.cpp b/src/hotspot/share/gc/shared/ageTable.cpp
index c055a7093ef..28f17a4220b 100644
--- a/src/hotspot/share/gc/shared/ageTable.cpp
+++ b/src/hotspot/share/gc/shared/ageTable.cpp
@@ -35,7 +35,7 @@
#include "utilities/copy.hpp"
#include "logging/logStream.hpp"
-/* Copyright (c) 1992, 2021, Oracle and/or its affiliates, and Stanford University.
+/* Copyright (c) 1992, 2024, Oracle and/or its affiliates, and Stanford University.
See the LICENSE file for license information. */
AgeTable::AgeTable(bool global) : _use_perf_data(UsePerfData && global) {
diff --git a/src/hotspot/share/gc/shared/ageTable.hpp b/src/hotspot/share/gc/shared/ageTable.hpp
index 745762c4e77..c44bdf85be6 100644
--- a/src/hotspot/share/gc/shared/ageTable.hpp
+++ b/src/hotspot/share/gc/shared/ageTable.hpp
@@ -30,7 +30,7 @@
#include "oops/oop.hpp"
#include "runtime/perfDataTypes.hpp"
-/* Copyright (c) 1992, 2021, Oracle and/or its affiliates, and Stanford University.
+/* Copyright (c) 1992, 2024, Oracle and/or its affiliates, and Stanford University.
See the LICENSE file for license information. */
// Age table for adaptive feedback-mediated tenuring (scavenging)
diff --git a/src/hotspot/share/gc/shared/barrierSet.hpp b/src/hotspot/share/gc/shared/barrierSet.hpp
index 7f1b1de8004..bcea1b427a3 100644
--- a/src/hotspot/share/gc/shared/barrierSet.hpp
+++ b/src/hotspot/share/gc/shared/barrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/barrierSetConfig.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
index 368312af06b..8bb7cf7c7ef 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/barrierSetConfig.inline.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
index 001b5b00372..38c568889d1 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/barrierSetNMethod.cpp b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
index f041a2ccce1..d61664cf5a6 100644
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/c1/barrierSetC1.cpp b/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp
index 8eaa23ab476..046a7ee5865 100644
--- a/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp
+++ b/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/c2/cardTableBarrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
index 2c2b142a12f..6450b8a76de 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/c2/cardTableBarrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
index 162eb173129..6c98133ca9e 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
index f21b99d3c8d..13f3e0783a6 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/classUnloadingContext.hpp b/src/hotspot/share/gc/shared/classUnloadingContext.hpp
index fa1acb89da7..91c2a8e4dcf 100644
--- a/src/hotspot/share/gc/shared/classUnloadingContext.hpp
+++ b/src/hotspot/share/gc/shared/classUnloadingContext.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/freeListAllocator.hpp b/src/hotspot/share/gc/shared/freeListAllocator.hpp
index 74b896963a7..94a90922952 100644
--- a/src/hotspot/share/gc/shared/freeListAllocator.hpp
+++ b/src/hotspot/share/gc/shared/freeListAllocator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/gcArguments.cpp b/src/hotspot/share/gc/shared/gcArguments.cpp
index 2522925746b..c20c8c4922e 100644
--- a/src/hotspot/share/gc/shared/gcArguments.cpp
+++ b/src/hotspot/share/gc/shared/gcArguments.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/gc/shared/gcCause.cpp b/src/hotspot/share/gc/shared/gcCause.cpp
index 2be7ef7be07..f73d3146aa3 100644
--- a/src/hotspot/share/gc/shared/gcCause.cpp
+++ b/src/hotspot/share/gc/shared/gcCause.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp
index f244d17c1ab..347e32be86a 100644
--- a/src/hotspot/share/gc/shared/gcCause.hpp
+++ b/src/hotspot/share/gc/shared/gcCause.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
index 8eb265b54d9..bb9d0806a53 100644
--- a/src/hotspot/share/gc/shared/gcConfig.cpp
+++ b/src/hotspot/share/gc/shared/gcConfig.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/gcConfiguration.cpp b/src/hotspot/share/gc/shared/gcConfiguration.cpp
index ba977c75627..4c94cfeab8b 100644
--- a/src/hotspot/share/gc/shared/gcConfiguration.cpp
+++ b/src/hotspot/share/gc/shared/gcConfiguration.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/gcLocker.cpp b/src/hotspot/share/gc/shared/gcLocker.cpp
index 42b40309d98..d4e10b26712 100644
--- a/src/hotspot/share/gc/shared/gcLocker.cpp
+++ b/src/hotspot/share/gc/shared/gcLocker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/gcName.hpp b/src/hotspot/share/gc/shared/gcName.hpp
index 642d734f673..213073e29d4 100644
--- a/src/hotspot/share/gc/shared/gcName.hpp
+++ b/src/hotspot/share/gc/shared/gcName.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/gcOverheadChecker.cpp b/src/hotspot/share/gc/shared/gcOverheadChecker.cpp
index 18a92caf5df..4eb5a459e74 100644
--- a/src/hotspot/share/gc/shared/gcOverheadChecker.cpp
+++ b/src/hotspot/share/gc/shared/gcOverheadChecker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, Google and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
index 9c7e5788a7e..5c5ee0beec7 100644
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/genArguments.hpp b/src/hotspot/share/gc/shared/genArguments.hpp
index dfc392cac6b..ae20c6126fc 100644
--- a/src/hotspot/share/gc/shared/genArguments.hpp
+++ b/src/hotspot/share/gc/shared/genArguments.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/isGCActiveMark.cpp b/src/hotspot/share/gc/shared/isGCActiveMark.cpp
index 7c400f2acc0..70d28979427 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.cpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/isGCActiveMark.hpp b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
index e523c600ace..f3a97603357 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.hpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/locationPrinter.cpp b/src/hotspot/share/gc/shared/locationPrinter.cpp
index 69fad87a097..62c5ce0df47 100644
--- a/src/hotspot/share/gc/shared/locationPrinter.cpp
+++ b/src/hotspot/share/gc/shared/locationPrinter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/markBitMap.cpp b/src/hotspot/share/gc/shared/markBitMap.cpp
index 91abb81ab31..bc90032206c 100644
--- a/src/hotspot/share/gc/shared/markBitMap.cpp
+++ b/src/hotspot/share/gc/shared/markBitMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,14 +25,13 @@
#include "precompiled.hpp"
#include "gc/shared/markBitMap.inline.hpp"
#include "memory/universe.hpp"
-#include "memory/virtualspace.hpp"
void MarkBitMap::print_on_error(outputStream* st, const char* prefix) const {
_bm.print_on_error(st, prefix);
}
size_t MarkBitMap::compute_size(size_t heap_size) {
- return ReservedSpace::allocation_align_size_up(heap_size / mark_distance());
+ return os::align_up_vm_allocation_granularity(heap_size / mark_distance());
}
size_t MarkBitMap::mark_distance() {
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
index fadc43c2a2c..fee652c8899 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
index 16d68a89095..b715a356d01 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/preservedMarks.hpp b/src/hotspot/share/gc/shared/preservedMarks.hpp
index 84bf18e41af..10f75116524 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.hpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/preservedMarks.inline.hpp b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
index fc732fee534..bc25637b0fb 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/pretouchTask.cpp b/src/hotspot/share/gc/shared/pretouchTask.cpp
index aba7a715fd3..427d14fd4e7 100644
--- a/src/hotspot/share/gc/shared/pretouchTask.cpp
+++ b/src/hotspot/share/gc/shared/pretouchTask.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/referenceProcessor.cpp b/src/hotspot/share/gc/shared/referenceProcessor.cpp
index 274fbd4c749..ff7530f2d32 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.cpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/satbMarkQueue.hpp b/src/hotspot/share/gc/shared/satbMarkQueue.hpp
index 78fe2033296..e40b2a3ecf3 100644
--- a/src/hotspot/share/gc/shared/satbMarkQueue.hpp
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/scavengableNMethods.hpp b/src/hotspot/share/gc/shared/scavengableNMethods.hpp
index 344575f045e..31093a0482c 100644
--- a/src/hotspot/share/gc/shared/scavengableNMethods.hpp
+++ b/src/hotspot/share/gc/shared/scavengableNMethods.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/softRefPolicy.hpp b/src/hotspot/share/gc/shared/softRefPolicy.hpp
index d3240d7079f..b725b843d2d 100644
--- a/src/hotspot/share/gc/shared/softRefPolicy.hpp
+++ b/src/hotspot/share/gc/shared/softRefPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/taskTerminator.hpp b/src/hotspot/share/gc/shared/taskTerminator.hpp
index 540d91c88bb..0ddb0ba07b9 100644
--- a/src/hotspot/share/gc/shared/taskTerminator.hpp
+++ b/src/hotspot/share/gc/shared/taskTerminator.hpp
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2018, 2020, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/workerThread.cpp b/src/hotspot/share/gc/shared/workerThread.cpp
index 49e43c284fa..4dde8e39387 100644
--- a/src/hotspot/share/gc/shared/workerThread.cpp
+++ b/src/hotspot/share/gc/shared/workerThread.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shared/workerThread.hpp b/src/hotspot/share/gc/shared/workerThread.hpp
index 642c8d93f59..d4e92797039 100644
--- a/src/hotspot/share/gc/shared/workerThread.hpp
+++ b/src/hotspot/share/gc/shared/workerThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index a7befc789ea..2f96dcc1d87 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -458,18 +458,24 @@ void ShenandoahBarrierSetC2::post_barrier(GraphKit* kit,
// No store check needed if we're storing a null.
if (val != nullptr && val->is_Con()) {
- // must be either an oop or NULL
+ // must be either an oop or null
const Type* t = val->bottom_type();
if (t == TypePtr::NULL_PTR || t == Type::TOP)
return;
}
if (ReduceInitialCardMarks && obj == kit->just_allocated_object(kit->control())) {
- // We can skip marks on a freshly-allocated object in Eden.
- // Keep this code in sync with new_deferred_store_barrier() in runtime.cpp.
- // That routine informs GC to take appropriate compensating steps,
- // upon a slow-path allocation, so as to make this card-mark
- // elision safe.
+ // We use card marks to track old to young references in Generational Shenandoah;
+ // see flag ShenandoahCardBarrier above.
+ // Objects are always allocated in the young generation and initialized
+ // before they are promoted. There's always a safepoint (e.g. at final mark)
+ // before an object is promoted from young to old. Promotion entails dirtying of
+ // the cards backing promoted objects, so they will be guaranteed to be scanned
+ // at the next remembered set scan of the old generation.
+ // Thus, we can safely skip card-marking of initializing stores on a
+ // freshly-allocated object. If any of the assumptions above change in
+ // the future, this code will need to be re-examined; see check in
+ // ShenandoahCardBarrier::on_slowpath_allocation_exit().
return;
}
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 37dce19339e..28849dc276c 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -886,7 +886,7 @@ void ShenandoahBarrierC2Support::test_gc_state(Node*& ctrl, Node* raw_mem, Node*
phase->register_new_node(gc_state_cmp, old_ctrl);
phase->register_new_node(gc_state_bool, old_ctrl);
- phase->set_ctrl(gc_state_offset, phase->C->root());
+ phase->set_root_as_ctrl(gc_state_offset);
assert(is_gc_state_test(gc_state_iff, flags), "Should match the shape");
}
@@ -944,7 +944,7 @@ void ShenandoahBarrierC2Support::test_in_cset(Node*& ctrl, Node*& not_cset_ctrl,
phase->register_control(ctrl, loop, cset_iff);
phase->register_control(not_cset_ctrl, loop, cset_iff);
- phase->set_ctrl(cset_addr_ptr, phase->C->root());
+ phase->set_root_as_ctrl(cset_addr_ptr);
phase->register_new_node(raw_val, old_ctrl);
phase->register_new_node(cset_idx, old_ctrl);
@@ -1148,8 +1148,9 @@ void ShenandoahBarrierC2Support::pin_and_expand(PhaseIdealLoop* phase) {
}
}
}
+ // Load barrier on the control output of a call
if ((ctrl->is_Proj() && ctrl->in(0)->is_CallJava()) || ctrl->is_CallJava()) {
- CallNode* call = ctrl->is_Proj() ? ctrl->in(0)->as_CallJava() : ctrl->as_CallJava();
+ CallJavaNode* call = ctrl->is_Proj() ? ctrl->in(0)->as_CallJava() : ctrl->as_CallJava();
if (call->entry_point() == OptoRuntime::rethrow_stub()) {
// The rethrow call may have too many projections to be
// properly handled here. Given there's no reason for a
@@ -1183,6 +1184,15 @@ void ShenandoahBarrierC2Support::pin_and_expand(PhaseIdealLoop* phase) {
continue;
}
CallProjections* projs = call->extract_projections(false, false);
+
+ // If this is a runtime call, it doesn't have an exception handling path
+ if (projs->fallthrough_catchproj == nullptr) {
+ assert(call->method() == nullptr, "should be runtime call");
+ assert(projs->catchall_catchproj == nullptr, "runtime call should not have catch all projection");
+ continue;
+ }
+
+ // Otherwise, clone the barrier so there's one for the fallthrough and one for the exception handling path
#ifdef ASSERT
VectorSet cloned;
#endif
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index 38e363664dc..62067bccb1e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -88,6 +88,14 @@ bool ShenandoahBarrierSet::need_keep_alive_barrier(DecoratorSet decorators, Basi
return (on_weak_ref || unknown) && keep_alive;
}
+void ShenandoahBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop new_obj) {
+#if COMPILER2_OR_JVMCI
+ assert(!ReduceInitialCardMarks || !ShenandoahCardBarrier || ShenandoahGenerationalHeap::heap()->is_in_young(new_obj),
+ "Error: losing card mark on initialzing store to old gen");
+#endif // COMPILER2_OR_JVMCI
+ assert(thread->deferred_card_mark().is_empty(), "We don't use this");
+}
+
void ShenandoahBarrierSet::on_thread_create(Thread* thread) {
// Create thread local data
ShenandoahThreadLocalData::create(thread);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
index 83fa8ce4a4f..eebde8504dc 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
@@ -77,17 +77,21 @@ class ShenandoahBarrierSet: public BarrierSet {
return (decorators & IN_NATIVE) != 0;
}
- void print_on(outputStream* st) const;
+ void print_on(outputStream* st) const override;
template <class T>
inline void arraycopy_barrier(T* src, T* dst, size_t count);
inline void clone_barrier(oop src);
void clone_barrier_runtime(oop src);
- virtual void on_thread_create(Thread* thread);
- virtual void on_thread_destroy(Thread* thread);
- virtual void on_thread_attach(Thread* thread);
- virtual void on_thread_detach(Thread* thread);
+ // Support for optimizing compilers to call the barrier set on slow path allocations
+ // that did not enter a TLAB. Used for e.g. ReduceInitialCardMarks to take any
+ // compensating actions to restore card-marks that might otherwise be incorrectly elided.
+ void on_slowpath_allocation_exit(JavaThread* thread, oop new_obj) override;
+ void on_thread_create(Thread* thread) override;
+ void on_thread_destroy(Thread* thread) override;
+ void on_thread_attach(Thread* thread) override;
+ void on_thread_detach(Thread* thread) override;
static inline oop resolve_forwarded_not_null(oop p);
static inline oop resolve_forwarded_not_null_mutator(oop p);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index a2f15140991..b1c2e72ef82 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -1046,7 +1046,10 @@ void ShenandoahConcurrentGC::op_strong_roots() {
}
void ShenandoahConcurrentGC::op_cleanup_early() {
- ShenandoahHeap::heap()->free_set()->recycle_trash();
+ ShenandoahWorkerScope scope(ShenandoahHeap::heap()->workers(),
+ ShenandoahWorkerPolicy::calc_workers_for_conc_cleanup(),
+ "cleanup early.");
+ ShenandoahHeap::heap()->recycle_trash();
}
void ShenandoahConcurrentGC::op_evacuate() {
@@ -1178,7 +1181,10 @@ void ShenandoahConcurrentGC::op_final_roots() {
}
void ShenandoahConcurrentGC::op_cleanup_complete() {
- ShenandoahHeap::heap()->free_set()->recycle_trash();
+ ShenandoahWorkerScope scope(ShenandoahHeap::heap()->workers(),
+ ShenandoahWorkerPolicy::calc_workers_for_conc_cleanup(),
+ "cleanup complete.");
+ ShenandoahHeap::heap()->recycle_trash();
}
bool ShenandoahConcurrentGC::check_cancellation_and_abort(ShenandoahDegenPoint point) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 1a29fbbc4a7..3aaa23adca7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -729,7 +729,6 @@ void ShenandoahRegionPartitions::assert_bounds() {
ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
_heap(heap),
_partitions(max_regions, this),
- _trash_regions(NEW_C_HEAP_ARRAY(ShenandoahHeapRegion*, max_regions, mtGC)),
_alloc_bias_weight(0)
{
clear_internal();
@@ -1002,7 +1001,7 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
return nullptr;
}
HeapWord* result = nullptr;
- try_recycle_trashed(r);
+ r->try_recycle_under_lock();
in_new_region = r->is_empty();
if (in_new_region) {
@@ -1213,7 +1212,7 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
// Initialize regions:
for (idx_t i = beg; i <= end; i++) {
ShenandoahHeapRegion* r = _heap->get_region(i);
- try_recycle_trashed(r);
+ r->try_recycle_under_lock();
assert(i == beg || _heap->get_region(i - 1)->index() + 1 == r->index(), "Should be contiguous");
assert(r->is_empty(), "Should be empty");
@@ -1255,63 +1254,28 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
return _heap->get_region(beg)->bottom();
}
-void ShenandoahFreeSet::try_recycle_trashed(ShenandoahHeapRegion* r) {
- if (r->is_trash()) {
- r->recycle();
+class ShenandoahRecycleTrashedRegionClosure final : public ShenandoahHeapRegionClosure {
+public:
+ ShenandoahRecycleTrashedRegionClosure(): ShenandoahHeapRegionClosure() {}
+
+ void heap_region_do(ShenandoahHeapRegion* r) {
+ r->try_recycle();
}
-}
+
+ bool is_thread_safe() {
+ return true;
+ }
+};
void ShenandoahFreeSet::recycle_trash() {
- // lock is not reentrable, check we don't have it
+ // lock is not non-reentrant, check we don't have it
shenandoah_assert_not_heaplocked();
- size_t count = 0;
- for (size_t i = 0; i < _heap->num_regions(); i++) {
- ShenandoahHeapRegion* r = _heap->get_region(i);
- if (r->is_trash()) {
- _trash_regions[count++] = r;
- }
- }
- size_t total_batches = 0;
- jlong batch_start_time = 0;
- jlong recycle_trash_start_time = os::javaTimeNanos(); // This value will be treated as the initial batch_start_time
- jlong batch_end_time = recycle_trash_start_time;
- // Process as many batches as can be processed within 10 us.
- static constexpr jlong deadline_ns = 10000; // 10 us
- size_t idx = 0;
- jlong predicted_next_batch_end_time;
- jlong batch_process_time_estimate = 0;
- while (idx < count) {
- if (idx > 0) {
- os::naked_yield(); // Yield to allow allocators to take the lock, except on the first iteration
- }
- // Avoid another call to javaTimeNanos() if we already know time at which last batch ended
- batch_start_time = batch_end_time;
- const jlong deadline = batch_start_time + deadline_ns;
+ ShenandoahHeap* heap = ShenandoahHeap::heap();
+ heap->assert_gc_workers(heap->workers()->active_workers());
- ShenandoahHeapLocker locker(_heap->lock());
- do {
- // Measurements on typical 2024 hardware suggest it typically requires between 1400 and 2000 ns to process a batch of
- // 32 regions, assuming low contention with other threads. Sometimes this goes higher, when mutator threads
- // are contending for CPU cores and/or the heap lock. On this hardware with a 10 us deadline, we expect 3-6 batches
- // to be processed between yields most of the time.
- //
- // Note that deadline is enforced since the end of previous batch. In the case that yield() or acquisition of heap lock
- // takes a "long time", we will have less time to process regions, but we will always process at least one batch between
- // yields. Yielding more frequently when there is heavy contention for the heap lock or for CPU cores is considered the
- // right thing to do.
- const size_t REGIONS_PER_BATCH = 32;
- size_t max_idx = MIN2(count, idx + REGIONS_PER_BATCH);
- while (idx < max_idx) {
- try_recycle_trashed(_trash_regions[idx++]);
- }
- total_batches++;
- batch_end_time = os::javaTimeNanos();
- // Estimate includes historic combination of yield times and heap lock acquisition times.
- batch_process_time_estimate = (batch_end_time - recycle_trash_start_time) / total_batches;
- predicted_next_batch_end_time = batch_end_time + batch_process_time_estimate;
- } while ((idx < count) && (predicted_next_batch_end_time < deadline));
- }
+ ShenandoahRecycleTrashedRegionClosure closure;
+ heap->parallel_heap_region_iterate(&closure);
}
void ShenandoahFreeSet::flip_to_old_gc(ShenandoahHeapRegion* r) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index c69d73060c9..45b33e5253b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -286,7 +286,6 @@ class ShenandoahFreeSet : public CHeapObj<mtGC> {
private:
ShenandoahHeap* const _heap;
ShenandoahRegionPartitions _partitions;
- ShenandoahHeapRegion** _trash_regions;
HeapWord* allocate_aligned_plab(size_t size, ShenandoahAllocRequest& req, ShenandoahHeapRegion* r);
@@ -352,7 +351,6 @@ class ShenandoahFreeSet : public CHeapObj<mtGC> {
HeapWord* try_allocate_from_mutator(ShenandoahAllocRequest& req, bool& in_new_region);
void clear_internal();
- void try_recycle_trashed(ShenandoahHeapRegion *r);
// Returns true iff this region is entirely available, either because it is empty() or because it has been found to represent
// immediate trash and we'll be able to immediately recycle it. Note that we cannot recycle immediate trash if
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index 3e880271529..2847d7c78ba 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -541,7 +541,7 @@ class ShenandoahEnsureHeapActiveClosure: public ShenandoahHeapRegionClosure {
ShenandoahEnsureHeapActiveClosure() : _heap(ShenandoahHeap::heap()) {}
void heap_region_do(ShenandoahHeapRegion* r) {
if (r->is_trash()) {
- r->recycle();
+ r->try_recycle_under_lock();
}
if (r->is_cset()) {
// Leave affiliation unchanged
@@ -990,7 +990,7 @@ class ShenandoahPostCompactClosure : public ShenandoahHeapRegionClosure {
// Recycle all trash regions
if (r->is_trash()) {
live = 0;
- r->recycle();
+ r->try_recycle_under_lock();
} else {
if (r->is_old()) {
ShenandoahGenerationalFullGC::account_for_region(r, _old_regions, _old_usage, _old_humongous_waste);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index a48b2baa18f..2bebac05f15 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -883,8 +883,7 @@ size_t ShenandoahGeneration::increment_affiliated_region_count() {
// During full gc, multiple GC worker threads may change region affiliations without a lock. No lock is enforced
// on read and write of _affiliated_region_count. At the end of full gc, a single thread overwrites the count with
// a coherent value.
- _affiliated_region_count++;
- return _affiliated_region_count;
+ return Atomic::add(&_affiliated_region_count, (size_t) 1);
}
size_t ShenandoahGeneration::decrement_affiliated_region_count() {
@@ -892,34 +891,37 @@ size_t ShenandoahGeneration::decrement_affiliated_region_count() {
// During full gc, multiple GC worker threads may change region affiliations without a lock. No lock is enforced
// on read and write of _affiliated_region_count. At the end of full gc, a single thread overwrites the count with
// a coherent value.
- _affiliated_region_count--;
+ auto affiliated_region_count = Atomic::sub(&_affiliated_region_count, (size_t) 1);
assert(ShenandoahHeap::heap()->is_full_gc_in_progress() ||
- (_used + _humongous_waste <= _affiliated_region_count * ShenandoahHeapRegion::region_size_bytes()),
+ (used() + _humongous_waste <= affiliated_region_count * ShenandoahHeapRegion::region_size_bytes()),
"used + humongous cannot exceed regions");
- return _affiliated_region_count;
+ return affiliated_region_count;
+}
+
+size_t ShenandoahGeneration::decrement_affiliated_region_count_without_lock() {
+ return Atomic::sub(&_affiliated_region_count, (size_t) 1);
}
size_t ShenandoahGeneration::increase_affiliated_region_count(size_t delta) {
shenandoah_assert_heaplocked_or_safepoint();
- _affiliated_region_count += delta;
- return _affiliated_region_count;
+ return Atomic::add(&_affiliated_region_count, delta);
}
size_t ShenandoahGeneration::decrease_affiliated_region_count(size_t delta) {
shenandoah_assert_heaplocked_or_safepoint();
- assert(_affiliated_region_count >= delta, "Affiliated region count cannot be negative");
+ assert(Atomic::load(&_affiliated_region_count) >= delta, "Affiliated region count cannot be negative");
- _affiliated_region_count -= delta;
+ auto const affiliated_region_count = Atomic::sub(&_affiliated_region_count, delta);
assert(ShenandoahHeap::heap()->is_full_gc_in_progress() ||
- (_used + _humongous_waste <= _affiliated_region_count * ShenandoahHeapRegion::region_size_bytes()),
+ (_used + _humongous_waste <= affiliated_region_count * ShenandoahHeapRegion::region_size_bytes()),
"used + humongous cannot exceed regions");
- return _affiliated_region_count;
+ return affiliated_region_count;
}
void ShenandoahGeneration::establish_usage(size_t num_regions, size_t num_bytes, size_t humongous_waste) {
assert(ShenandoahSafepoint::is_at_shenandoah_safepoint(), "must be at a safepoint");
- _affiliated_region_count = num_regions;
- _used = num_bytes;
+ Atomic::store(&_affiliated_region_count, num_regions);
+ Atomic::store(&_used, num_bytes);
_humongous_waste = humongous_waste;
}
@@ -948,21 +950,22 @@ void ShenandoahGeneration::decrease_used(size_t bytes) {
}
size_t ShenandoahGeneration::used_regions() const {
- return _affiliated_region_count;
+ return Atomic::load(&_affiliated_region_count);
}
size_t ShenandoahGeneration::free_unaffiliated_regions() const {
size_t result = max_capacity() / ShenandoahHeapRegion::region_size_bytes();
- if (_affiliated_region_count > result) {
+ auto const used_regions = this->used_regions();
+ if (used_regions > result) {
result = 0;
} else {
- result -= _affiliated_region_count;
+ result -= used_regions;
}
return result;
}
size_t ShenandoahGeneration::used_regions_size() const {
- return _affiliated_region_count * ShenandoahHeapRegion::region_size_bytes();
+ return used_regions() * ShenandoahHeapRegion::region_size_bytes();
}
size_t ShenandoahGeneration::available() const {
@@ -996,7 +999,7 @@ size_t ShenandoahGeneration::increase_capacity(size_t increment) {
// This detects arithmetic wraparound on _used
assert(ShenandoahHeap::heap()->is_full_gc_in_progress() ||
- (_affiliated_region_count * ShenandoahHeapRegion::region_size_bytes() >= _used),
+ (used_regions_size() >= used()),
"Affiliated regions must hold more than what is currently used");
return _max_capacity;
}
@@ -1020,12 +1023,12 @@ size_t ShenandoahGeneration::decrease_capacity(size_t decrement) {
// This detects arithmetic wraparound on _used
assert(ShenandoahHeap::heap()->is_full_gc_in_progress() ||
- (_affiliated_region_count * ShenandoahHeapRegion::region_size_bytes() >= _used),
+ (used_regions_size() >= used()),
"Affiliated regions must hold more than what is currently used");
assert(ShenandoahHeap::heap()->is_full_gc_in_progress() ||
(_used <= _max_capacity), "Cannot use more than capacity");
assert(ShenandoahHeap::heap()->is_full_gc_in_progress() ||
- (_affiliated_region_count * ShenandoahHeapRegion::region_size_bytes() <= _max_capacity),
+ (used_regions_size() <= _max_capacity),
"Cannot use more than capacity");
return _max_capacity;
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
index f43c295dff5..2f1102edbd7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
@@ -52,7 +52,7 @@ class ShenandoahGeneration : public CHeapObj<mtGC>, public ShenandoahSpaceInfo {
ShenandoahReferenceProcessor* const _ref_processor;
- size_t _affiliated_region_count;
+ volatile size_t _affiliated_region_count;
// How much free memory is left in the last region of humongous objects.
// This is _not_ included in used, but it _is_ deducted from available,
@@ -131,7 +131,7 @@ class ShenandoahGeneration : public CHeapObj<mtGC>, public ShenandoahSpaceInfo {
virtual size_t used_regions() const;
virtual size_t used_regions_size() const;
virtual size_t free_unaffiliated_regions() const;
- size_t used() const override { return _used; }
+ size_t used() const override { return Atomic::load(&_used); }
size_t available() const override;
size_t available_with_reserve() const;
size_t used_including_humongous_waste() const {
@@ -219,6 +219,8 @@ class ShenandoahGeneration : public CHeapObj<mtGC>, public ShenandoahSpaceInfo {
// Return the updated value of affiliated_region_count
size_t decrement_affiliated_region_count();
+ // Same as decrement_affiliated_region_count, but w/o the need to hold heap lock before being called.
+ size_t decrement_affiliated_region_count_without_lock();
// Return the updated value of affiliated_region_count
size_t increase_affiliated_region_count(size_t delta);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 5f957b73410..5beced0544c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -605,10 +605,10 @@ class ShenandoahHeap : public CollectedHeap {
// such an object as unreachable.
inline bool is_in_old_during_young_collection(oop obj) const;
- inline ShenandoahAffiliation region_affiliation(const ShenandoahHeapRegion* r);
+ inline ShenandoahAffiliation region_affiliation(const ShenandoahHeapRegion* r) const;
inline void set_affiliation(ShenandoahHeapRegion* r, ShenandoahAffiliation new_affiliation);
- inline ShenandoahAffiliation region_affiliation(size_t index);
+ inline ShenandoahAffiliation region_affiliation(size_t index) const;
bool requires_barriers(stackChunkOop obj) const override;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index 2b34b2d5cfc..6a38266489e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -371,7 +371,7 @@ inline bool ShenandoahHeap::is_in_active_generation(oop obj) const {
// No flickering!
assert(gen == active_generation(), "Race?");
- switch (_affiliations[index]) {
+ switch (region_affiliation(index)) {
case ShenandoahAffiliation::FREE:
// Free regions are in old, young, and global collections
return true;
@@ -382,25 +382,25 @@ inline bool ShenandoahHeap::is_in_active_generation(oop obj) const {
// Old regions are in old and global collections, not in young collections
return !gen->is_young();
default:
- assert(false, "Bad affiliation (%d) for region " SIZE_FORMAT, _affiliations[index], index);
+ assert(false, "Bad affiliation (%d) for region " SIZE_FORMAT, region_affiliation(index), index);
return false;
}
}
inline bool ShenandoahHeap::is_in_young(const void* p) const {
- return is_in_reserved(p) && (_affiliations[heap_region_index_containing(p)] == ShenandoahAffiliation::YOUNG_GENERATION);
+ return is_in_reserved(p) && (region_affiliation(heap_region_index_containing(p)) == ShenandoahAffiliation::YOUNG_GENERATION);
}
inline bool ShenandoahHeap::is_in_old(const void* p) const {
- return is_in_reserved(p) && (_affiliations[heap_region_index_containing(p)] == ShenandoahAffiliation::OLD_GENERATION);
+ return is_in_reserved(p) && (region_affiliation(heap_region_index_containing(p)) == ShenandoahAffiliation::OLD_GENERATION);
}
inline bool ShenandoahHeap::is_in_old_during_young_collection(oop obj) const {
return active_generation()->is_young() && is_in_old(obj);
}
-inline ShenandoahAffiliation ShenandoahHeap::region_affiliation(const ShenandoahHeapRegion *r) {
- return (ShenandoahAffiliation) _affiliations[r->index()];
+inline ShenandoahAffiliation ShenandoahHeap::region_affiliation(const ShenandoahHeapRegion *r) const {
+ return region_affiliation(r->index());
}
inline void ShenandoahHeap::assert_lock_for_affiliation(ShenandoahAffiliation orig_affiliation,
@@ -419,7 +419,7 @@ inline void ShenandoahHeap::assert_lock_for_affiliation(ShenandoahAffiliation or
//
// Note: during full GC, all transitions between states are possible. During Full GC, we should be in a safepoint.
- if ((orig_affiliation == ShenandoahAffiliation::FREE) || (new_affiliation == ShenandoahAffiliation::FREE)) {
+ if (orig_affiliation == ShenandoahAffiliation::FREE) {
shenandoah_assert_heaplocked_or_safepoint();
}
}
@@ -428,11 +428,11 @@ inline void ShenandoahHeap::set_affiliation(ShenandoahHeapRegion* r, ShenandoahA
#ifdef ASSERT
assert_lock_for_affiliation(region_affiliation(r), new_affiliation);
#endif
- _affiliations[r->index()] = (uint8_t) new_affiliation;
+ Atomic::store(_affiliations + r->index(), (uint8_t) new_affiliation);
}
-inline ShenandoahAffiliation ShenandoahHeap::region_affiliation(size_t index) {
- return (ShenandoahAffiliation) _affiliations[index];
+inline ShenandoahAffiliation ShenandoahHeap::region_affiliation(size_t index) const {
+ return (ShenandoahAffiliation) Atomic::load(_affiliations + index);
}
inline bool ShenandoahHeap::requires_marking(const void* entry) const {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index 9767caf8156..d46b76c9376 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -88,11 +88,12 @@ ShenandoahHeapRegion::ShenandoahHeapRegion(HeapWord* start, size_t index, bool c
if (ZapUnusedHeapArea && committed) {
SpaceMangler::mangle_region(MemRegion(_bottom, _end));
}
+ _recycling.unset();
}
void ShenandoahHeapRegion::report_illegal_transition(const char *method) {
stringStream ss;
- ss.print("Illegal region state transition from \"%s\", at %s\n ", region_state_to_string(_state), method);
+ ss.print("Illegal region state transition from \"%s\", at %s\n ", region_state_to_string(state()), method);
print_on(&ss);
fatal("%s", ss.freeze());
}
@@ -100,7 +101,7 @@ void ShenandoahHeapRegion::report_illegal_transition(const char *method) {
void ShenandoahHeapRegion::make_regular_allocation(ShenandoahAffiliation affiliation) {
shenandoah_assert_heaplocked();
reset_age();
- switch (_state) {
+ switch (state()) {
case _empty_uncommitted:
do_commit();
case _empty_committed:
@@ -120,7 +121,7 @@ void ShenandoahHeapRegion::make_regular_allocation(ShenandoahAffiliation affilia
void ShenandoahHeapRegion::make_affiliated_maybe() {
shenandoah_assert_heaplocked();
assert(!ShenandoahHeap::heap()->mode()->is_generational(), "Only call if non-generational");
- switch (_state) {
+ switch (state()) {
case _empty_uncommitted:
case _empty_committed:
case _cset:
@@ -146,14 +147,15 @@ void ShenandoahHeapRegion::make_regular_bypass() {
ShenandoahHeap::heap()->is_degenerated_gc_in_progress(),
"Only for STW GC or when Universe is initializing (CDS)");
reset_age();
- switch (_state) {
+ auto cur_state = state();
+ switch (cur_state) {
case _empty_uncommitted:
do_commit();
case _empty_committed:
case _cset:
case _humongous_start:
case _humongous_cont:
- if (_state == _humongous_start || _state == _humongous_cont) {
+ if (cur_state == _humongous_start || cur_state == _humongous_cont) {
// CDS allocates chunks of the heap to fill with regular objects. The allocator
// will dutifully track any waste in the unused portion of the last region. Once
// CDS has finished initializing the objects, it will convert these regions to
@@ -177,7 +179,7 @@ void ShenandoahHeapRegion::make_regular_bypass() {
void ShenandoahHeapRegion::make_humongous_start() {
shenandoah_assert_heaplocked();
reset_age();
- switch (_state) {
+ switch (state()) {
case _empty_uncommitted:
do_commit();
case _empty_committed:
@@ -194,7 +196,7 @@ void ShenandoahHeapRegion::make_humongous_start_bypass(ShenandoahAffiliation aff
// Don't bother to account for affiliated regions during Full GC. We recompute totals at end.
set_affiliation(affiliation);
reset_age();
- switch (_state) {
+ switch (state()) {
case _empty_committed:
case _regular:
case _humongous_start:
@@ -209,7 +211,7 @@ void ShenandoahHeapRegion::make_humongous_start_bypass(ShenandoahAffiliation aff
void ShenandoahHeapRegion::make_humongous_cont() {
shenandoah_assert_heaplocked();
reset_age();
- switch (_state) {
+ switch (state()) {
case _empty_uncommitted:
do_commit();
case _empty_committed:
@@ -226,7 +228,7 @@ void ShenandoahHeapRegion::make_humongous_cont_bypass(ShenandoahAffiliation affi
set_affiliation(affiliation);
// Don't bother to account for affiliated regions during Full GC. We recompute totals at end.
reset_age();
- switch (_state) {
+ switch (state()) {
case _empty_committed:
case _regular:
case _humongous_start:
@@ -242,7 +244,7 @@ void ShenandoahHeapRegion::make_pinned() {
shenandoah_assert_heaplocked();
assert(pin_count() > 0, "Should have pins: " SIZE_FORMAT, pin_count());
- switch (_state) {
+ switch (state()) {
case _regular:
set_state(_pinned);
case _pinned_cset:
@@ -253,7 +255,7 @@ void ShenandoahHeapRegion::make_pinned() {
case _pinned_humongous_start:
return;
case _cset:
- _state = _pinned_cset;
+ set_state(_pinned_cset);
return;
default:
report_illegal_transition("pinning");
@@ -264,7 +266,7 @@ void ShenandoahHeapRegion::make_unpinned() {
shenandoah_assert_heaplocked();
assert(pin_count() == 0, "Should not have pins: " SIZE_FORMAT, pin_count());
- switch (_state) {
+ switch (state()) {
case _pinned:
assert(is_affiliated(), "Pinned region should be affiliated");
set_state(_regular);
@@ -286,7 +288,7 @@ void ShenandoahHeapRegion::make_unpinned() {
void ShenandoahHeapRegion::make_cset() {
shenandoah_assert_heaplocked();
// Leave age untouched. We need to consult the age when we are deciding whether to promote evacuated objects.
- switch (_state) {
+ switch (state()) {
case _regular:
set_state(_cset);
case _cset:
@@ -299,7 +301,7 @@ void ShenandoahHeapRegion::make_cset() {
void ShenandoahHeapRegion::make_trash() {
shenandoah_assert_heaplocked();
reset_age();
- switch (_state) {
+ switch (state()) {
case _humongous_start:
case _humongous_cont:
{
@@ -329,10 +331,9 @@ void ShenandoahHeapRegion::make_trash_immediate() {
}
void ShenandoahHeapRegion::make_empty() {
- shenandoah_assert_heaplocked();
reset_age();
CENSUS_NOISE(clear_youth();)
- switch (_state) {
+ switch (state()) {
case _trash:
set_state(_empty_committed);
_empty_time = os::elapsedTime();
@@ -344,7 +345,7 @@ void ShenandoahHeapRegion::make_empty() {
void ShenandoahHeapRegion::make_uncommitted() {
shenandoah_assert_heaplocked();
- switch (_state) {
+ switch (state()) {
case _empty_committed:
do_uncommit();
set_state(_empty_uncommitted);
@@ -358,7 +359,7 @@ void ShenandoahHeapRegion::make_committed_bypass() {
shenandoah_assert_heaplocked();
assert (ShenandoahHeap::heap()->is_full_gc_in_progress(), "only for full GC");
- switch (_state) {
+ switch (state()) {
case _empty_uncommitted:
do_commit();
set_state(_empty_committed);
@@ -399,7 +400,7 @@ void ShenandoahHeapRegion::print_on(outputStream* st) const {
st->print("|");
st->print(SIZE_FORMAT_W(5), this->_index);
- switch (_state) {
+ switch (state()) {
case _empty_uncommitted:
st->print("|EU ");
break;
@@ -569,27 +570,62 @@ ShenandoahHeapRegion* ShenandoahHeapRegion::humongous_start_region() const {
return r;
}
-void ShenandoahHeapRegion::recycle() {
- shenandoah_assert_heaplocked();
- ShenandoahHeap* heap = ShenandoahHeap::heap();
- ShenandoahGeneration* generation = heap->generation_for(affiliation());
- heap->decrease_used(generation, used());
- generation->decrement_affiliated_region_count();
+void ShenandoahHeapRegion::recycle_internal() {
+ assert(_recycling.is_set() && is_trash(), "Wrong state");
+ ShenandoahHeap* heap = ShenandoahHeap::heap();
set_top(bottom());
clear_live_data();
reset_alloc_metadata();
-
heap->marking_context()->reset_top_at_mark_start(this);
-
set_update_watermark(bottom());
+ if (ZapUnusedHeapArea) {
+ SpaceMangler::mangle_region(MemRegion(bottom(), end()));
+ }
make_empty();
-
set_affiliation(FREE);
- if (ZapUnusedHeapArea) {
- SpaceMangler::mangle_region(MemRegion(bottom(), end()));
+}
+
+void ShenandoahHeapRegion::try_recycle_under_lock() {
+ shenandoah_assert_heaplocked();
+ if (is_trash() && _recycling.try_set()) {
+ if (is_trash()) {
+ ShenandoahHeap* heap = ShenandoahHeap::heap();
+ ShenandoahGeneration* generation = heap->generation_for(affiliation());
+
+ heap->decrease_used(generation, used());
+ generation->decrement_affiliated_region_count();
+
+ recycle_internal();
+ }
+ _recycling.unset();
+ } else {
+ // Ensure recycling is unset before returning to mutator to continue memory allocation.
+ while (_recycling.is_set()) {
+ if (os::is_MP()) {
+ SpinPause();
+ } else {
+ os::naked_yield();
+ }
+ }
+ }
+}
+
+void ShenandoahHeapRegion::try_recycle() {
+ shenandoah_assert_not_heaplocked();
+ if (is_trash() && _recycling.try_set()) {
+ // Double check region state after win the race to set recycling flag
+ if (is_trash()) {
+ ShenandoahHeap* heap = ShenandoahHeap::heap();
+ ShenandoahGeneration* generation = heap->generation_for(affiliation());
+ heap->decrease_used(generation, used());
+ generation->decrement_affiliated_region_count_without_lock();
+
+ recycle_internal();
+ }
+ _recycling.unset();
}
}
@@ -795,11 +831,11 @@ void ShenandoahHeapRegion::set_state(RegionState to) {
evt.set_index((unsigned) index());
evt.set_start((uintptr_t)bottom());
evt.set_used(used());
- evt.set_from(_state);
+ evt.set_from(state());
evt.set_to(to);
evt.commit();
}
- _state = to;
+ Atomic::store(&_state, to);
}
void ShenandoahHeapRegion::record_pin() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
index 1c0f1182f07..3dc8febbad4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
@@ -165,6 +165,7 @@ class ShenandoahHeapRegion {
}
void report_illegal_transition(const char* method);
+ void recycle_internal();
public:
static int region_states_num() {
@@ -188,33 +189,35 @@ class ShenandoahHeapRegion {
void make_uncommitted();
void make_committed_bypass();
- // Individual states:
- bool is_empty_uncommitted() const { return _state == _empty_uncommitted; }
- bool is_empty_committed() const { return _state == _empty_committed; }
- bool is_regular() const { return _state == _regular; }
- bool is_humongous_continuation() const { return _state == _humongous_cont; }
-
- // Participation in logical groups:
- bool is_empty() const { return is_empty_committed() || is_empty_uncommitted(); }
- bool is_active() const { return !is_empty() && !is_trash(); }
- bool is_trash() const { return _state == _trash; }
- bool is_humongous_start() const { return _state == _humongous_start || _state == _pinned_humongous_start; }
- bool is_humongous() const { return is_humongous_start() || is_humongous_continuation(); }
+ // Primitive state predicates
+ bool is_empty_uncommitted() const { return state() == _empty_uncommitted; }
+ bool is_empty_committed() const { return state() == _empty_committed; }
+ bool is_regular() const { return state() == _regular; }
+ bool is_humongous_continuation() const { return state() == _humongous_cont; }
+ bool is_regular_pinned() const { return state() == _pinned; }
+ bool is_trash() const { return state() == _trash; }
+
+ // Derived state predicates (boolean combinations of individual states)
+ bool static is_empty_state(RegionState state) { return state == _empty_committed || state == _empty_uncommitted; }
+ bool static is_humongous_start_state(RegionState state) { return state == _humongous_start || state == _pinned_humongous_start; }
+ bool is_empty() const { return is_empty_state(this->state()); }
+ bool is_active() const { auto cur_state = state(); return !is_empty_state(cur_state) && cur_state != _trash; }
+ bool is_humongous_start() const { return is_humongous_start_state(state()); }
+ bool is_humongous() const { auto cur_state = state(); return is_humongous_start_state(cur_state) || cur_state == _humongous_cont; }
bool is_committed() const { return !is_empty_uncommitted(); }
- bool is_cset() const { return _state == _cset || _state == _pinned_cset; }
- bool is_pinned() const { return _state == _pinned || _state == _pinned_cset || _state == _pinned_humongous_start; }
- bool is_regular_pinned() const { return _state == _pinned; }
+ bool is_cset() const { auto cur_state = state(); return cur_state == _cset || cur_state == _pinned_cset; }
+ bool is_pinned() const { auto cur_state = state(); return cur_state == _pinned || cur_state == _pinned_cset || cur_state == _pinned_humongous_start; }
inline bool is_young() const;
inline bool is_old() const;
inline bool is_affiliated() const;
// Macro-properties:
- bool is_alloc_allowed() const { return is_empty() || is_regular() || _state == _pinned; }
- bool is_stw_move_allowed() const { return is_regular() || _state == _cset || (ShenandoahHumongousMoves && _state == _humongous_start); }
+ bool is_alloc_allowed() const { auto cur_state = state(); return is_empty_state(cur_state) || cur_state == _regular || cur_state == _pinned; }
+ bool is_stw_move_allowed() const { auto cur_state = state(); return cur_state == _regular || cur_state == _cset || (ShenandoahHumongousMoves && cur_state == _humongous_start); }
- RegionState state() const { return _state; }
- int state_ordinal() const { return region_state_to_ordinal(_state); }
+ RegionState state() const { return Atomic::load(&_state); }
+ int state_ordinal() const { return region_state_to_ordinal(state()); }
void record_pin();
void record_unpin();
@@ -243,7 +246,7 @@ class ShenandoahHeapRegion {
HeapWord* _top_before_promoted;
// Seldom updated fields
- RegionState _state;
+ volatile RegionState _state;
HeapWord* _coalesce_and_fill_boundary; // for old regions not selected as collection set candidates.
// Frequently updated fields
@@ -261,6 +264,8 @@ class ShenandoahHeapRegion {
uint _age;
CENSUS_NOISE(uint _youth;) // tracks epochs of retrograde ageing (rejuvenation)
+ ShenandoahSharedFlag _recycling; // Used to indicate that the region is being recycled; see try_recycle*().
+
public:
ShenandoahHeapRegion(HeapWord* start, size_t index, bool committed);
@@ -376,7 +381,9 @@ class ShenandoahHeapRegion {
void print_on(outputStream* st) const;
- void recycle();
+ void try_recycle_under_lock();
+
+ void try_recycle();
inline void begin_preemptible_coalesce_and_fill() {
_coalesce_and_fill_boundary = _bottom;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
index dcd6dd49f93..cd0f31ae14f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, Red Hat, Inc. and/or its affiliates.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,6 +27,7 @@
#include "precompiled.hpp"
#include "gc/shenandoah/shenandoahMarkBitMap.inline.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "runtime/os.hpp"
#include "utilities/globalDefinitions.hpp"
ShenandoahMarkBitMap::ShenandoahMarkBitMap(MemRegion heap, MemRegion storage) :
@@ -37,7 +38,7 @@ ShenandoahMarkBitMap::ShenandoahMarkBitMap(MemRegion heap, MemRegion storage) :
}
size_t ShenandoahMarkBitMap::compute_size(size_t heap_size) {
- return ReservedSpace::allocation_align_size_up(heap_size / mark_distance());
+ return os::align_up_vm_allocation_granularity(heap_size / mark_distance());
}
size_t ShenandoahMarkBitMap::mark_distance() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
index f7cb3478ea9..56daf4c5956 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, Red Hat, Inc. and/or its affiliates.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
index bf9261f47ac..f0a9752b614 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, Red Hat, Inc. and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
index deddf984625..07d2fd3c4e3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, Red Hat, Inc. and/or its affiliates.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
index fa523551790..682c4268754 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, Red Hat, Inc. and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.cpp
index fbf89644adf..df056047622 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2021, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.hpp
index 7298c42cbb0..7a7291abed2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.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) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/shenandoah/shenandoahWorkerPolicy.cpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp
index 288cf231e2d..30651f0ccf1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp
@@ -74,3 +74,7 @@ uint ShenandoahWorkerPolicy::calc_workers_for_final_update_ref() {
uint ShenandoahWorkerPolicy::calc_workers_for_conc_reset() {
return ConcGCThreads;
}
+
+uint ShenandoahWorkerPolicy::calc_workers_for_conc_cleanup() {
+ return ConcGCThreads;
+}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp
index e07fc885e28..0de1cf3664b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp
@@ -64,6 +64,9 @@ class ShenandoahWorkerPolicy : AllStatic {
// Calculate workers for concurrent reset
static uint calc_workers_for_conc_reset();
+
+ // Calculate workers for concurrent cleanup
+ static uint calc_workers_for_conc_cleanup();
};
#endif // SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
diff --git a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
index 376df7f7a0f..851fa394722 100644
--- a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
+++ b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
@@ -39,7 +39,7 @@
volatile_nonstatic_field(ShenandoahGeneration, _used, size_t) \
static_field(ShenandoahHeapRegion, RegionSizeBytes, size_t) \
static_field(ShenandoahHeapRegion, RegionSizeBytesShift, size_t) \
- nonstatic_field(ShenandoahHeapRegion, _state, ShenandoahHeapRegion::RegionState) \
+ volatile_nonstatic_field(ShenandoahHeapRegion, _state, ShenandoahHeapRegion::RegionState) \
nonstatic_field(ShenandoahHeapRegion, _index, size_t const) \
nonstatic_field(ShenandoahHeapRegion, _bottom, HeapWord* const) \
nonstatic_field(ShenandoahHeapRegion, _top, HeapWord*) \
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
index c4241393d8b..158a9b54098 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zArguments.hpp b/src/hotspot/share/gc/z/zArguments.hpp
index b51eb116dbf..3ed1c8e212e 100644
--- a/src/hotspot/share/gc/z/zArguments.hpp
+++ b/src/hotspot/share/gc/z/zArguments.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zBarrier.hpp b/src/hotspot/share/gc/z/zBarrier.hpp
index 0e46538a6a5..827778f28bb 100644
--- a/src/hotspot/share/gc/z/zBarrier.hpp
+++ b/src/hotspot/share/gc/z/zBarrier.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zBarrierSet.cpp b/src/hotspot/share/gc/z/zBarrierSet.cpp
index 48228a3e1ab..4ce591a507a 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zBarrierSet.hpp b/src/hotspot/share/gc/z/zBarrierSet.hpp
index 4a979af65b2..22342862a33 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.hpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zBarrierSetRuntime.cpp b/src/hotspot/share/gc/z/zBarrierSetRuntime.cpp
index c267d9bb24a..935238c4e4f 100644
--- a/src/hotspot/share/gc/z/zBarrierSetRuntime.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSetRuntime.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zBarrierSetRuntime.hpp b/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp
index 8d59be02e68..f6ac9cc7590 100644
--- a/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp
+++ b/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zDirector.hpp b/src/hotspot/share/gc/z/zDirector.hpp
index 929ec6c2c56..624d356ffe2 100644
--- a/src/hotspot/share/gc/z/zDirector.hpp
+++ b/src/hotspot/share/gc/z/zDirector.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zDriver.cpp b/src/hotspot/share/gc/z/zDriver.cpp
index 107be979c25..c91de172fee 100644
--- a/src/hotspot/share/gc/z/zDriver.cpp
+++ b/src/hotspot/share/gc/z/zDriver.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zDriver.hpp b/src/hotspot/share/gc/z/zDriver.hpp
index 5f1fe08a0b6..8f178b88688 100644
--- a/src/hotspot/share/gc/z/zDriver.hpp
+++ b/src/hotspot/share/gc/z/zDriver.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zForwarding.cpp b/src/hotspot/share/gc/z/zForwarding.cpp
index 4df6e9a2d81..622f271a6d3 100644
--- a/src/hotspot/share/gc/z/zForwarding.cpp
+++ b/src/hotspot/share/gc/z/zForwarding.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp
index 7b75c63cf8c..955cdf6fd79 100644
--- a/src/hotspot/share/gc/z/zHeap.hpp
+++ b/src/hotspot/share/gc/z/zHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zHeap.inline.hpp b/src/hotspot/share/gc/z/zHeap.inline.hpp
index 127212aef0b..26c1b2d1e62 100644
--- a/src/hotspot/share/gc/z/zHeap.inline.hpp
+++ b/src/hotspot/share/gc/z/zHeap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zInitialize.hpp b/src/hotspot/share/gc/z/zInitialize.hpp
index 3c551b4c622..ce31912586e 100644
--- a/src/hotspot/share/gc/z/zInitialize.hpp
+++ b/src/hotspot/share/gc/z/zInitialize.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zIterator.inline.hpp b/src/hotspot/share/gc/z/zIterator.inline.hpp
index af97a549b0d..fb20a424288 100644
--- a/src/hotspot/share/gc/z/zIterator.inline.hpp
+++ b/src/hotspot/share/gc/z/zIterator.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zLiveMap.inline.hpp b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
index a9382522480..54589e45c45 100644
--- a/src/hotspot/share/gc/z/zLiveMap.inline.hpp
+++ b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zMarkStack.hpp b/src/hotspot/share/gc/z/zMarkStack.hpp
index 8c717fae32b..8a24c84c8d9 100644
--- a/src/hotspot/share/gc/z/zMarkStack.hpp
+++ b/src/hotspot/share/gc/z/zMarkStack.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zMarkStackAllocator.cpp b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
index 100036dc3fe..2bc37a0483a 100644
--- a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
+++ b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zNMethod.hpp b/src/hotspot/share/gc/z/zNMethod.hpp
index 7b65a0776d2..2c92e1f5efb 100644
--- a/src/hotspot/share/gc/z/zNMethod.hpp
+++ b/src/hotspot/share/gc/z/zNMethod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zNMethodData.cpp b/src/hotspot/share/gc/z/zNMethodData.cpp
index e200d24bc8a..467553bd7a6 100644
--- a/src/hotspot/share/gc/z/zNMethodData.cpp
+++ b/src/hotspot/share/gc/z/zNMethodData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zNMethodData.hpp b/src/hotspot/share/gc/z/zNMethodData.hpp
index 124e4020a53..b9013bc57ea 100644
--- a/src/hotspot/share/gc/z/zNMethodData.hpp
+++ b/src/hotspot/share/gc/z/zNMethodData.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zObjectAllocator.cpp b/src/hotspot/share/gc/z/zObjectAllocator.cpp
index bf6dc98fc72..c088e20244a 100644
--- a/src/hotspot/share/gc/z/zObjectAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zObjectAllocator.hpp b/src/hotspot/share/gc/z/zObjectAllocator.hpp
index 5377972b7ba..a350c4f876a 100644
--- a/src/hotspot/share/gc/z/zObjectAllocator.hpp
+++ b/src/hotspot/share/gc/z/zObjectAllocator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zPageAllocator.hpp b/src/hotspot/share/gc/z/zPageAllocator.hpp
index 7df83a10eaf..e80169fe260 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.hpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zPhysicalMemory.hpp b/src/hotspot/share/gc/z/zPhysicalMemory.hpp
index b22179987a2..09f71013258 100644
--- a/src/hotspot/share/gc/z/zPhysicalMemory.hpp
+++ b/src/hotspot/share/gc/z/zPhysicalMemory.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zPhysicalMemory.inline.hpp b/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp
index 744c68daa7e..6d2380c9013 100644
--- a/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp
+++ b/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zReferenceProcessor.hpp b/src/hotspot/share/gc/z/zReferenceProcessor.hpp
index 31c789ee859..fb67bfdeead 100644
--- a/src/hotspot/share/gc/z/zReferenceProcessor.hpp
+++ b/src/hotspot/share/gc/z/zReferenceProcessor.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zRelocate.hpp b/src/hotspot/share/gc/z/zRelocate.hpp
index 1b35abdf521..400fc61b055 100644
--- a/src/hotspot/share/gc/z/zRelocate.hpp
+++ b/src/hotspot/share/gc/z/zRelocate.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zRemembered.cpp b/src/hotspot/share/gc/z/zRemembered.cpp
index dc28b6d937d..18657c44c5c 100644
--- a/src/hotspot/share/gc/z/zRemembered.cpp
+++ b/src/hotspot/share/gc/z/zRemembered.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zRemembered.hpp b/src/hotspot/share/gc/z/zRemembered.hpp
index 815d5c787d3..1400472f2bc 100644
--- a/src/hotspot/share/gc/z/zRemembered.hpp
+++ b/src/hotspot/share/gc/z/zRemembered.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zStackWatermark.cpp b/src/hotspot/share/gc/z/zStackWatermark.cpp
index 0c7ec553e5c..a4962416f81 100644
--- a/src/hotspot/share/gc/z/zStackWatermark.cpp
+++ b/src/hotspot/share/gc/z/zStackWatermark.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zStackWatermark.hpp b/src/hotspot/share/gc/z/zStackWatermark.hpp
index f2cf59d3b4a..76981ad9501 100644
--- a/src/hotspot/share/gc/z/zStackWatermark.hpp
+++ b/src/hotspot/share/gc/z/zStackWatermark.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zUncoloredRoot.inline.hpp b/src/hotspot/share/gc/z/zUncoloredRoot.inline.hpp
index a7d39e5ed9c..f0b3dfcb42c 100644
--- a/src/hotspot/share/gc/z/zUncoloredRoot.inline.hpp
+++ b/src/hotspot/share/gc/z/zUncoloredRoot.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zValue.hpp b/src/hotspot/share/gc/z/zValue.hpp
index 4953978297f..2661a906dff 100644
--- a/src/hotspot/share/gc/z/zValue.hpp
+++ b/src/hotspot/share/gc/z/zValue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zVerify.hpp b/src/hotspot/share/gc/z/zVerify.hpp
index 447d38504a2..c035caf430f 100644
--- a/src/hotspot/share/gc/z/zVerify.hpp
+++ b/src/hotspot/share/gc/z/zVerify.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zVirtualMemory.cpp b/src/hotspot/share/gc/z/zVirtualMemory.cpp
index 2160aa38948..f645eef7408 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.cpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/gc/z/zVirtualMemory.hpp b/src/hotspot/share/gc/z/zVirtualMemory.hpp
index 9b5e1e1bfad..a2df86262ea 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/include/cds.h b/src/hotspot/share/include/cds.h
index 4cc309dd991..eb8010d625f 100644
--- a/src/hotspot/share/include/cds.h
+++ b/src/hotspot/share/include/cds.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/interpreter/bootstrapInfo.cpp b/src/hotspot/share/interpreter/bootstrapInfo.cpp
index e3efe2a7504..44ef8166603 100644
--- a/src/hotspot/share/interpreter/bootstrapInfo.cpp
+++ b/src/hotspot/share/interpreter/bootstrapInfo.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/interpreter/bootstrapInfo.hpp b/src/hotspot/share/interpreter/bootstrapInfo.hpp
index d480e69f368..4c479fe845f 100644
--- a/src/hotspot/share/interpreter/bootstrapInfo.hpp
+++ b/src/hotspot/share/interpreter/bootstrapInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/interpreter/bytecode.cpp b/src/hotspot/share/interpreter/bytecode.cpp
index de45e8ae3db..a1d125ed162 100644
--- a/src/hotspot/share/interpreter/bytecode.cpp
+++ b/src/hotspot/share/interpreter/bytecode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/interpreter/bytecodeUtils.cpp b/src/hotspot/share/interpreter/bytecodeUtils.cpp
index 3e272a4219d..9d947f5519d 100644
--- a/src/hotspot/share/interpreter/bytecodeUtils.cpp
+++ b/src/hotspot/share/interpreter/bytecodeUtils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/interpreter/interpreter.hpp b/src/hotspot/share/interpreter/interpreter.hpp
index fa591ba8bfd..85f9be5b3db 100644
--- a/src/hotspot/share/interpreter/interpreter.hpp
+++ b/src/hotspot/share/interpreter/interpreter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/interpreter/rewriter.cpp b/src/hotspot/share/interpreter/rewriter.cpp
index db15f726792..9c7035758b3 100644
--- a/src/hotspot/share/interpreter/rewriter.cpp
+++ b/src/hotspot/share/interpreter/rewriter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/interpreter/zero/zeroInterpreter.hpp b/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
index 699d50e778f..4cc78532379 100644
--- a/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
+++ b/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index 5020920945e..e6dfdf39d8e 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/jni/jfrJniMethodRegistration.cpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
index 415c7468a62..4702cbe467b 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/jni/jfrUpcalls.cpp b/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
index 2f1cb7e2d54..1915c127b4f 100644
--- a/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
+++ b/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/leakprofiler/leakProfiler.cpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp
index cf69dd56934..7ae0ef8b484 100644
--- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/leakprofiler/leakProfiler.hpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
index 08544f43948..873f8efa173 100644
--- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/leakprofiler/sampling/objectSampler.cpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp
index e4f822a407f..a004bad34cd 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/leakprofiler/sampling/objectSampler.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
index 25b5a67dd2a..85dfed43220 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp
index aaebc8f3e7e..8916bfbb753 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
index 9f4969b0187..d513b82b38c 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
index a1d9f6efb19..0cb8561ad9f 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/recorder/storage/jfrMemorySpace.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp
index 49ced300e55..8812d0a8ffd 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/recorder/storage/jfrStorage.cpp b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
index d9f90ee1153..8b920d163b0 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/recorder/storage/jfrVirtualMemory.cpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
index aaae65ed10d..000ab5e235a 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
@@ -420,11 +420,11 @@ void* JfrVirtualMemory::initialize(size_t reservation_size_request_bytes,
_aligned_datum_size_bytes = align_up(datum_size_bytes, BytesPerWord);
assert(is_aligned(_aligned_datum_size_bytes, BytesPerWord), "invariant");
- reservation_size_request_bytes = ReservedSpace::allocation_align_size_up(reservation_size_request_bytes);
+ reservation_size_request_bytes = os::align_up_vm_allocation_granularity(reservation_size_request_bytes);
assert(is_aligned(reservation_size_request_bytes, os::vm_allocation_granularity()), "invariant");
assert(is_aligned(reservation_size_request_bytes, _aligned_datum_size_bytes), "invariant");
block_size_request_bytes = MAX2(block_size_request_bytes, (size_t)os::vm_allocation_granularity());
- block_size_request_bytes = ReservedSpace::allocation_align_size_up(block_size_request_bytes);
+ block_size_request_bytes = os::align_up_vm_allocation_granularity(block_size_request_bytes);
assert(is_aligned(block_size_request_bytes, os::vm_allocation_granularity()), "invariant");
assert(is_aligned(block_size_request_bytes, _aligned_datum_size_bytes), "invariant");
// adjustment to valid ratio in units of vm_allocation_granularity
diff --git a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
index a6cff1609a4..b8dc7a6b3b5 100644
--- a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
+++ b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/support/jfrMethodData.cpp b/src/hotspot/share/jfr/support/jfrMethodData.cpp
index 4595f26f4aa..af5d19c262c 100644
--- a/src/hotspot/share/jfr/support/jfrMethodData.cpp
+++ b/src/hotspot/share/jfr/support/jfrMethodData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jfr/utilities/jfrVersionSystem.hpp b/src/hotspot/share/jfr/utilities/jfrVersionSystem.hpp
index 39c40fd7147..c628034a808 100644
--- a/src/hotspot/share/jfr/utilities/jfrVersionSystem.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrVersionSystem.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jvmci.cpp b/src/hotspot/share/jvmci/jvmci.cpp
index 6d240bc9063..9442c241e16 100644
--- a/src/hotspot/share/jvmci/jvmci.cpp
+++ b/src/hotspot/share/jvmci/jvmci.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jvmci.hpp b/src/hotspot/share/jvmci/jvmci.hpp
index 49240174967..7eaea597936 100644
--- a/src/hotspot/share/jvmci/jvmci.hpp
+++ b/src/hotspot/share/jvmci/jvmci.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/jvmciCodeInstaller.hpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
index 0cb7f287480..b493c48e348 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.cpp b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
index 5b26b6419df..aa32e0e3eca 100644
--- a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
+++ b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/libadt/vectset.cpp b/src/hotspot/share/libadt/vectset.cpp
index e2eb08b1a34..feb3ab10c65 100644
--- a/src/hotspot/share/libadt/vectset.cpp
+++ b/src/hotspot/share/libadt/vectset.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/libadt/vectset.hpp b/src/hotspot/share/libadt/vectset.hpp
index fee15566f24..9314778e033 100644
--- a/src/hotspot/share/libadt/vectset.hpp
+++ b/src/hotspot/share/libadt/vectset.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/memory/heap.cpp b/src/hotspot/share/memory/heap.cpp
index 92a376defa5..f88f5c4dc12 100644
--- a/src/hotspot/share/memory/heap.cpp
+++ b/src/hotspot/share/memory/heap.cpp
@@ -200,6 +200,7 @@ void CodeHeap::on_code_mapping(char* base, size_t size) {
bool CodeHeap::reserve(ReservedSpace rs, size_t committed_size, size_t segment_size) {
assert(rs.size() >= committed_size, "reserved < committed");
+ assert(is_aligned(committed_size, rs.page_size()), "must be page aligned");
assert(segment_size >= sizeof(FreeBlock), "segment size is too small");
assert(is_power_of_2(segment_size), "segment_size must be a power of 2");
assert_locked_or_safepoint(CodeCache_lock);
@@ -208,13 +209,8 @@ bool CodeHeap::reserve(ReservedSpace rs, size_t committed_size, size_t segment_s
_log2_segment_size = exact_log2(segment_size);
// Reserve and initialize space for _memory.
- const size_t page_size = rs.page_size();
- const size_t granularity = os::vm_allocation_granularity();
- const size_t c_size = align_up(committed_size, page_size);
- assert(c_size <= rs.size(), "alignment made committed size to large");
-
- os::trace_page_sizes(_name, c_size, rs.size(), rs.base(), rs.size(), page_size);
- if (!_memory.initialize(rs, c_size)) {
+ os::trace_page_sizes(_name, committed_size, rs.size(), rs.base(), rs.size(), rs.page_size());
+ if (!_memory.initialize(rs, committed_size)) {
return false;
}
@@ -222,7 +218,7 @@ bool CodeHeap::reserve(ReservedSpace rs, size_t committed_size, size_t segment_s
_number_of_committed_segments = size_to_segments(_memory.committed_size());
_number_of_reserved_segments = size_to_segments(_memory.reserved_size());
assert(_number_of_reserved_segments >= _number_of_committed_segments, "just checking");
- const size_t reserved_segments_alignment = MAX2(os::vm_page_size(), granularity);
+ const size_t reserved_segments_alignment = MAX2(os::vm_page_size(), os::vm_allocation_granularity());
const size_t reserved_segments_size = align_up(_number_of_reserved_segments, reserved_segments_alignment);
const size_t committed_segments_size = align_to_page_size(_number_of_committed_segments);
diff --git a/src/hotspot/share/memory/heapInspection.cpp b/src/hotspot/share/memory/heapInspection.cpp
index 889b813985f..b26c8279615 100644
--- a/src/hotspot/share/memory/heapInspection.cpp
+++ b/src/hotspot/share/memory/heapInspection.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/memory/heapInspection.hpp b/src/hotspot/share/memory/heapInspection.hpp
index 76dd0fe4cc5..3c005e33d1c 100644
--- a/src/hotspot/share/memory/heapInspection.hpp
+++ b/src/hotspot/share/memory/heapInspection.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/memory/iterator.cpp b/src/hotspot/share/memory/iterator.cpp
index e83b2a59646..d2d478cb518 100644
--- a/src/hotspot/share/memory/iterator.cpp
+++ b/src/hotspot/share/memory/iterator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index 33574f7f5d1..0e4e4a4660d 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -329,20 +329,6 @@ ReservedSpace ReservedSpace::partition(size_t offset, size_t partition_size, siz
return result;
}
-size_t ReservedSpace::page_align_size_up(size_t size) {
- return align_up(size, os::vm_page_size());
-}
-
-
-size_t ReservedSpace::page_align_size_down(size_t size) {
- return align_down(size, os::vm_page_size());
-}
-
-
-size_t ReservedSpace::allocation_align_size_up(size_t size) {
- return align_up(size, os::vm_allocation_granularity());
-}
-
void ReservedSpace::release() {
if (is_reserved()) {
char *real_base = _base - _noaccess_prefix;
diff --git a/src/hotspot/share/memory/virtualspace.hpp b/src/hotspot/share/memory/virtualspace.hpp
index 6139c3a413f..c78953912b3 100644
--- a/src/hotspot/share/memory/virtualspace.hpp
+++ b/src/hotspot/share/memory/virtualspace.hpp
@@ -103,10 +103,6 @@ class ReservedSpace {
inline ReservedSpace last_part (size_t partition_size);
inline ReservedSpace partition (size_t offset, size_t partition_size);
- // Alignment
- static size_t page_align_size_up(size_t size);
- static size_t page_align_size_down(size_t size);
- static size_t allocation_align_size_up(size_t size);
bool contains(const void* p) const {
return (base() <= ((char*)p)) && (((char*)p) < (base() + size()));
}
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
index f3c6fe92897..97415cf6e85 100644
--- a/src/hotspot/share/oops/compressedKlass.cpp
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -30,6 +30,7 @@
#include "runtime/java.hpp"
#include "runtime/os.hpp"
#include "utilities/debug.hpp"
+#include "utilities/formatBuffer.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/ostream.hpp"
@@ -176,6 +177,12 @@ void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t
calc_lowest_highest_narrow_klass_id();
+ // This has already been checked for SharedBaseAddress and if this fails, it's a bug in the allocation code.
+ if (!set_klass_decode_mode()) {
+ fatal("base=" PTR_FORMAT " given with shift %d, cannot be used to encode class pointers",
+ p2i(_base), _shift);
+ }
+
DEBUG_ONLY(sanity_check_after_initialization();)
}
@@ -267,6 +274,20 @@ void CompressedKlassPointers::initialize(address addr, size_t len) {
calc_lowest_highest_narrow_klass_id();
+ // Initialize klass decode mode and check compability with decode instructions
+ if (!set_klass_decode_mode()) {
+
+ // Give fatal error if this is a specified address
+ if ((address)CompressedClassSpaceBaseAddress == _base) {
+ vm_exit_during_initialization(
+ err_msg("CompressedClassSpaceBaseAddress=" PTR_FORMAT " given with shift %d, cannot be used to encode class pointers",
+ CompressedClassSpaceBaseAddress, _shift));
+ } else {
+ // If this fails, it's a bug in the allocation code.
+ fatal("CompressedClassSpaceBaseAddress=" PTR_FORMAT " given with shift %d, cannot be used to encode class pointers",
+ p2i(_base), _shift);
+ }
+ }
#ifdef ASSERT
sanity_check_after_initialization();
#endif
diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
index 9e3a09d73b9..f0615283f33 100644
--- a/src/hotspot/share/oops/compressedKlass.hpp
+++ b/src/hotspot/share/oops/compressedKlass.hpp
@@ -258,6 +258,9 @@ class CompressedKlassPointers : public AllStatic {
is_aligned(addr, klass_alignment_in_bytes());
}
+ // Check that with the given base, shift and range, aarch64 an encode and decode the klass pointer.
+ static bool check_klass_decode_mode(address base, int shift, const size_t range) NOT_AARCH64({ return true;});
+ static bool set_klass_decode_mode() NOT_AARCH64({ return true;}); // can be called after initialization
};
#endif // SHARE_OOPS_COMPRESSEDKLASS_HPP
diff --git a/src/hotspot/share/oops/constMethodFlags.hpp b/src/hotspot/share/oops/constMethodFlags.hpp
index 8cb0057e6ee..c3fbd056ad4 100644
--- a/src/hotspot/share/oops/constMethodFlags.hpp
+++ b/src/hotspot/share/oops/constMethodFlags.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/oops/constantPool.inline.hpp b/src/hotspot/share/oops/constantPool.inline.hpp
index e216f33c896..3aed4408121 100644
--- a/src/hotspot/share/oops/constantPool.inline.hpp
+++ b/src/hotspot/share/oops/constantPool.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/oops/instanceKlassFlags.hpp b/src/hotspot/share/oops/instanceKlassFlags.hpp
index 7362e41d7bc..14b850ddd19 100644
--- a/src/hotspot/share/oops/instanceKlassFlags.hpp
+++ b/src/hotspot/share/oops/instanceKlassFlags.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/oops/klassVtable.hpp b/src/hotspot/share/oops/klassVtable.hpp
index 5c64076d126..319a2137851 100644
--- a/src/hotspot/share/oops/klassVtable.hpp
+++ b/src/hotspot/share/oops/klassVtable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/oops/methodFlags.hpp b/src/hotspot/share/oops/methodFlags.hpp
index eae351bafdb..994a2d43024 100644
--- a/src/hotspot/share/oops/methodFlags.hpp
+++ b/src/hotspot/share/oops/methodFlags.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/oops/oopsHierarchy.hpp b/src/hotspot/share/oops/oopsHierarchy.hpp
index b58a032d3af..2e1f13bfa95 100644
--- a/src/hotspot/share/oops/oopsHierarchy.hpp
+++ b/src/hotspot/share/oops/oopsHierarchy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp
index 366c45823bf..c9443ddcd6f 100644
--- a/src/hotspot/share/opto/addnode.cpp
+++ b/src/hotspot/share/opto/addnode.cpp
@@ -1425,6 +1425,20 @@ Node* MaxINode::Ideal(PhaseGVN* phase, bool can_reshape) {
return IdealI(phase, can_reshape);
}
+Node* MaxINode::Identity(PhaseGVN* phase) {
+ const TypeInt* t1 = phase->type(in(1))->is_int();
+ const TypeInt* t2 = phase->type(in(2))->is_int();
+
+ // Can we determine the maximum statically?
+ if (t1->_lo >= t2->_hi) {
+ return in(1);
+ } else if (t2->_lo >= t1->_hi) {
+ return in(2);
+ }
+
+ return MaxNode::Identity(phase);
+}
+
//=============================================================================
//------------------------------add_ring---------------------------------------
// Supplied function returns the sum of the inputs.
@@ -1444,6 +1458,20 @@ Node* MinINode::Ideal(PhaseGVN* phase, bool can_reshape) {
return IdealI(phase, can_reshape);
}
+Node* MinINode::Identity(PhaseGVN* phase) {
+ const TypeInt* t1 = phase->type(in(1))->is_int();
+ const TypeInt* t2 = phase->type(in(2))->is_int();
+
+ // Can we determine the minimum statically?
+ if (t1->_lo >= t2->_hi) {
+ return in(2);
+ } else if (t2->_lo >= t1->_hi) {
+ return in(1);
+ }
+
+ return MaxNode::Identity(phase);
+}
+
//------------------------------add_ring---------------------------------------
// Supplied function returns the sum of the inputs.
const Type *MinINode::add_ring( const Type *t0, const Type *t1 ) const {
@@ -1586,11 +1614,56 @@ Node* MinLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
return nullptr;
}
+int MaxNode::opposite_opcode() const {
+ if (Opcode() == max_opcode()) {
+ return min_opcode();
+ } else {
+ assert(Opcode() == min_opcode(), "Caller should be either %s or %s, but is %s", NodeClassNames[max_opcode()], NodeClassNames[min_opcode()], NodeClassNames[Opcode()]);
+ return max_opcode();
+ }
+}
+
+// Given a redundant structure such as Max/Min(A, Max/Min(B, C)) where A == B or A == C, return the useful part of the structure.
+// 'operation' is the node expected to be the inner 'Max/Min(B, C)', and 'operand' is the node expected to be the 'A' operand of the outer node.
+Node* MaxNode::find_identity_operation(Node* operation, Node* operand) {
+ if (operation->Opcode() == Opcode() || operation->Opcode() == opposite_opcode()) {
+ Node* n1 = operation->in(1);
+ Node* n2 = operation->in(2);
+
+ // Given Op(A, Op(B, C)), see if either A == B or A == C is true.
+ if (n1 == operand || n2 == operand) {
+ // If the operations are the same return the inner operation, as Max(A, Max(A, B)) == Max(A, B).
+ if (operation->Opcode() == Opcode()) {
+ return operation;
+ }
+
+ // If the operations are different return the operand 'A', as Max(A, Min(A, B)) == A if the value isn't floating point.
+ // With floating point values, the identity doesn't hold if B == NaN.
+ const Type* type = bottom_type();
+ if (type->isa_int() || type->isa_long()) {
+ return operand;
+ }
+ }
+ }
+
+ return nullptr;
+}
+
Node* MaxNode::Identity(PhaseGVN* phase) {
if (in(1) == in(2)) {
return in(1);
}
+ Node* identity_1 = MaxNode::find_identity_operation(in(2), in(1));
+ if (identity_1 != nullptr) {
+ return identity_1;
+ }
+
+ Node* identity_2 = MaxNode::find_identity_operation(in(1), in(2));
+ if (identity_2 != nullptr) {
+ return identity_2;
+ }
+
return AddNode::Identity(phase);
}
diff --git a/src/hotspot/share/opto/addnode.hpp b/src/hotspot/share/opto/addnode.hpp
index 8afbb440572..0a2c42b7796 100644
--- a/src/hotspot/share/opto/addnode.hpp
+++ b/src/hotspot/share/opto/addnode.hpp
@@ -262,8 +262,7 @@ class XorLNode : public AddNode {
//------------------------------MaxNode----------------------------------------
// Max (or min) of 2 values. Included with the ADD nodes because it inherits
-// all the behavior of addition on a ring. Only new thing is that we allow
-// 2 equal inputs to be equal.
+// all the behavior of addition on a ring.
class MaxNode : public AddNode {
private:
static Node* build_min_max(Node* a, Node* b, bool is_max, bool is_unsigned, const Type* t, PhaseGVN& gvn);
@@ -277,6 +276,8 @@ class MaxNode : public AddNode {
virtual int min_opcode() const = 0;
Node* IdealI(PhaseGVN* phase, bool can_reshape);
virtual Node* Identity(PhaseGVN* phase);
+ Node* find_identity_operation(Node* operation, Node* operand);
+ int opposite_opcode() const;
static Node* unsigned_max(Node* a, Node* b, const Type* t, PhaseGVN& gvn) {
return build_min_max(a, b, true, true, t, gvn);
@@ -321,6 +322,7 @@ class MaxINode : public MaxNode {
virtual uint ideal_reg() const { return Op_RegI; }
int max_opcode() const { return Op_MaxI; }
int min_opcode() const { return Op_MinI; }
+ virtual Node* Identity(PhaseGVN* phase);
virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
};
@@ -337,7 +339,8 @@ class MinINode : public MaxNode {
virtual uint ideal_reg() const { return Op_RegI; }
int max_opcode() const { return Op_MaxI; }
int min_opcode() const { return Op_MinI; }
- virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual Node* Identity(PhaseGVN* phase);
+ virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
};
//------------------------------MaxLNode---------------------------------------
diff --git a/src/hotspot/share/opto/arraycopynode.cpp b/src/hotspot/share/opto/arraycopynode.cpp
index faa98f6cab1..8e9541710f9 100644
--- a/src/hotspot/share/opto/arraycopynode.cpp
+++ b/src/hotspot/share/opto/arraycopynode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/block.cpp b/src/hotspot/share/opto/block.cpp
index 857bdeb7032..14bc9e0797c 100644
--- a/src/hotspot/share/opto/block.cpp
+++ b/src/hotspot/share/opto/block.cpp
@@ -1356,6 +1356,9 @@ void PhaseCFG::verify() const {
verify_memory_writer_placement(block, n);
if (n->needs_anti_dependence_check()) {
verify_anti_dependences(block, n);
+ if (C->failing()) {
+ return;
+ }
}
for (uint k = 0; k < n->req(); k++) {
Node *def = n->in(k);
diff --git a/src/hotspot/share/opto/c2_CodeStubs.cpp b/src/hotspot/share/opto/c2_CodeStubs.cpp
index 793e915da7d..bbdb7a1c856 100644
--- a/src/hotspot/share/opto/c2_CodeStubs.cpp
+++ b/src/hotspot/share/opto/c2_CodeStubs.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index 207e419a77f..90f7a249660 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -818,9 +818,6 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
case vmIntrinsics::_VectorBinaryOp:
case vmIntrinsics::_VectorTernaryOp:
case vmIntrinsics::_VectorFromBitsCoerced:
- case vmIntrinsics::_VectorShuffleIota:
- case vmIntrinsics::_VectorShuffleToVector:
- case vmIntrinsics::_VectorWrapShuffleIndexes:
case vmIntrinsics::_VectorLoadOp:
case vmIntrinsics::_VectorLoadMaskedOp:
case vmIntrinsics::_VectorStoreOp:
diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index 97e989f8cab..f7aa03317e4 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp
index 8c65c3d025a..f734ba90a68 100644
--- a/src/hotspot/share/opto/castnode.cpp
+++ b/src/hotspot/share/opto/castnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/castnode.hpp b/src/hotspot/share/opto/castnode.hpp
index 2fe2dc79e96..dca1d012001 100644
--- a/src/hotspot/share/opto/castnode.hpp
+++ b/src/hotspot/share/opto/castnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index 693033fb27e..53bada64ca9 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -2563,6 +2563,9 @@ void PhaseChaitin::verify_base_ptrs(ResourceArea* a) const {
void PhaseChaitin::verify(ResourceArea* a, bool verify_ifg) const {
if (VerifyRegisterAllocator) {
_cfg.verify();
+ if (C->failing()) {
+ return;
+ }
verify_base_ptrs(a);
if (verify_ifg) {
_ifg->verify(this);
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 8f12b4c2257..27f3eda9da7 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -3451,6 +3451,9 @@ void Compile::Code_Gen() {
print_method(PHASE_GLOBAL_CODE_MOTION, 2);
NOT_PRODUCT( verify_graph_edges(); )
cfg.verify();
+ if (failing()) {
+ return;
+ }
}
PhaseChaitin regalloc(unique(), cfg, matcher, false);
@@ -5558,7 +5561,6 @@ bool Compile::fail_randomly() {
}
bool Compile::failure_is_artificial() {
- assert(failing_internal(), "should be failing");
return C->failure_reason_is("StressBailout");
}
#endif
diff --git a/src/hotspot/share/opto/constantTable.cpp b/src/hotspot/share/opto/constantTable.cpp
index 66cf8105476..bcfc048746f 100644
--- a/src/hotspot/share/opto/constantTable.cpp
+++ b/src/hotspot/share/opto/constantTable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,26 +41,13 @@ bool ConstantTable::Constant::operator==(const Constant& other) {
return false;
}
for (int i = 0; i < get_array()->length(); i++) {
- jvalue ele1 = get_array()->at(i);
- jvalue ele2 = other.get_array()->at(i);
- bool is_eq;
- switch (type()) {
- case T_BOOLEAN: is_eq = ele1.z == ele2.z; break;
- case T_BYTE: is_eq = ele1.b == ele2.b; break;
- case T_CHAR: is_eq = ele1.c == ele2.c; break;
- case T_SHORT: is_eq = ele1.s == ele2.s; break;
- case T_INT: is_eq = ele1.i == ele2.i; break;
- case T_LONG: is_eq = ele1.j == ele2.j; break;
- case T_FLOAT: is_eq = jint_cast(ele1.f) == jint_cast(ele2.f); break;
- case T_DOUBLE: is_eq = jlong_cast(ele1.d) == jlong_cast(ele2.d); break;
- default: ShouldNotReachHere(); is_eq = false;
- }
- if (!is_eq) {
+ if (get_array()->at(i) != other.get_array()->at(i)) {
return false;
}
}
return true;
}
+
// For floating point values we compare the bit pattern.
switch (type()) {
case T_INT: return (_v._value.i == other._v._value.i);
@@ -75,16 +62,45 @@ bool ConstantTable::Constant::operator==(const Constant& other) {
}
}
+int ConstantTable::alignment() const {
+ int res = 1;
+ for (int i = 0; i < _constants.length(); i++) {
+ const Constant& c = _constants.at(i);
+ res = MAX2(res, c.alignment());
+ }
+ return res;
+}
+
int ConstantTable::qsort_comparator(Constant* a, Constant* b) {
- // sort descending
- if (a->freq() > b->freq()) return -1;
- if (a->freq() < b->freq()) return 1;
- return 0;
+ // put the ones with large alignments first
+ if (a->alignment() > 8 && b->alignment() > 8) {
+ // sort them by alignment
+ if (a->alignment() > b->alignment()) {
+ return -1;
+ } else if (a->alignment() < b->alignment()) {
+ return 1;
+ } else {
+ return 0;
+ }
+ } else if (a->alignment() > 8) {
+ return -1;
+ } else if (b->alignment() > 8) {
+ return 1;
+ } else {
+ // for constants with small alignments, sort them by frequency
+ if (a->freq() > b->freq()) {
+ return -1;
+ } else if (a->freq() < b->freq()) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
}
static int constant_size(ConstantTable::Constant* con) {
if (con->is_array()) {
- return type2aelembytes(con->type()) * con->get_array()->length();
+ return con->get_array()->length();
}
switch (con->type()) {
case T_INT: return sizeof(jint );
@@ -149,7 +165,7 @@ bool ConstantTable::emit(C2_MacroAssembler* masm) const {
Constant con = _constants.at(i);
address constant_addr = nullptr;
if (con.is_array()) {
- constant_addr = masm->array_constant(con.type(), con.get_array(), con.alignment());
+ constant_addr = masm->array_constant(con.get_array(), con.alignment());
} else {
switch (con.type()) {
case T_INT: constant_addr = masm->int_constant( con.get_jint() ); break;
@@ -251,16 +267,14 @@ ConstantTable::Constant ConstantTable::add(Metadata* metadata) {
return con;
}
-ConstantTable::Constant ConstantTable::add(MachConstantNode* n, BasicType bt,
- GrowableArray<jvalue>* array, int alignment) {
- Constant con(bt, array, alignment);
+ConstantTable::Constant ConstantTable::add(MachConstantNode* n, GrowableArray<jbyte>* array, int alignment) {
+ Constant con(array, alignment);
add(con);
return con;
}
-ConstantTable::Constant ConstantTable::add(MachConstantNode* n, BasicType bt,
- GrowableArray<jvalue>* array) {
- return add(n, bt, array, array->length() * type2aelembytes(bt));
+ConstantTable::Constant ConstantTable::add(MachConstantNode* n, GrowableArray<jbyte>* array) {
+ return add(n, array, array->length());
}
ConstantTable::Constant ConstantTable::add(MachConstantNode* n, MachOper* oper) {
diff --git a/src/hotspot/share/opto/constantTable.hpp b/src/hotspot/share/opto/constantTable.hpp
index 74d310ec8d5..d1b36942c18 100644
--- a/src/hotspot/share/opto/constantTable.hpp
+++ b/src/hotspot/share/opto/constantTable.hpp
@@ -43,7 +43,7 @@ class ConstantTable {
union {
jvalue _value;
Metadata* _metadata;
- GrowableArray<jvalue>* _array;
+ GrowableArray<jbyte>* _array;
} _v;
int _offset; // offset of this constant (in bytes) relative to the constant table base.
float _freq;
@@ -72,18 +72,17 @@ class ConstantTable {
{
_v._metadata = metadata;
}
- Constant(BasicType type, GrowableArray<jvalue>* array, int alignment, bool can_be_reused = true) :
- _type(type),
+ Constant(GrowableArray<jbyte>* array, int alignment) :
+ _type(T_BYTE),
_is_array(true),
_alignment(alignment),
_offset(-1),
_freq(0.0f),
- _can_be_reused(can_be_reused)
+ _can_be_reused(true)
{
- assert(is_java_primitive(type), "not applicable for %s", type2name(type));
assert(is_power_of_2(alignment), "invalid alignment %d", alignment);
- _v._array = new GrowableArray<jvalue>(array->length());
- for (jvalue ele : *array) {
+ _v._array = new GrowableArray<jbyte>(array->length());
+ for (jbyte ele : *array) {
_v._array->append(ele);
}
}
@@ -102,7 +101,7 @@ class ConstantTable {
Metadata* get_metadata() const { return _v._metadata; }
- GrowableArray<jvalue>* get_array() const { return _v._array; }
+ const GrowableArray<jbyte>* get_array() const { return _v._array; }
int offset() const { return _offset; }
void set_offset(int offset) { _offset = offset; }
@@ -135,6 +134,10 @@ class ConstantTable {
int size() const { assert(_size != -1, "not calculated yet"); return _size; }
+ // The minimum alignment requirement of the constant table, must be a power of 2. The constant
+ // section of the nmethod must satisfy this value.
+ int alignment() const;
+
int calculate_table_base_offset() const; // AD specific
void set_table_base_offset(int x) { assert(_table_base_offset == -1 || x == _table_base_offset, "can't change"); _table_base_offset = x; }
int table_base_offset() const { assert(_table_base_offset != -1, "not set yet"); return _table_base_offset; }
@@ -150,8 +153,8 @@ class ConstantTable {
void add(Constant& con);
Constant add(MachConstantNode* n, BasicType type, jvalue value);
Constant add(Metadata* metadata);
- Constant add(MachConstantNode* n, BasicType bt, GrowableArray<jvalue>* array);
- Constant add(MachConstantNode* n, BasicType bt, GrowableArray<jvalue>* array, int alignment);
+ Constant add(MachConstantNode* n, GrowableArray<jbyte>* array);
+ Constant add(MachConstantNode* n, GrowableArray<jbyte>* array, int alignment);
Constant add(MachConstantNode* n, MachOper* oper);
Constant add(MachConstantNode* n, jint i) {
jvalue value; value.i = i;
diff --git a/src/hotspot/share/opto/divnode.cpp b/src/hotspot/share/opto/divnode.cpp
index 8247265ba31..9211b42c11b 100644
--- a/src/hotspot/share/opto/divnode.cpp
+++ b/src/hotspot/share/opto/divnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -447,6 +447,47 @@ static Node *transform_long_divide( PhaseGVN *phase, Node *dividend, jlong divis
return q;
}
+template <typename TypeClass, typename Unsigned>
+Node* unsigned_div_ideal(PhaseGVN* phase, bool can_reshape, Node* div) {
+ // Check for dead control input
+ if (div->in(0) != nullptr && div->remove_dead_region(phase, can_reshape)) {
+ return div;
+ }
+ // Don't bother trying to transform a dead node
+ if (div->in(0) != nullptr && div->in(0)->is_top()) {
+ return nullptr;
+ }
+
+ const Type* t = phase->type(div->in(2));
+ if (t == Type::TOP) {
+ return nullptr;
+ }
+ const TypeClass* type_divisor = t->cast<TypeClass>();
+
+ // Check for useless control input
+ // Check for excluding div-zero case
+ if (div->in(0) != nullptr && (type_divisor->_hi < 0 || type_divisor->_lo > 0)) {
+ div->set_req(0, nullptr); // Yank control input
+ return div;
+ }
+
+ if (!type_divisor->is_con()) {
+ return nullptr;
+ }
+ Unsigned divisor = static_cast<Unsigned>(type_divisor->get_con()); // Get divisor
+
+ if (divisor == 0 || divisor == 1) {
+ return nullptr; // Dividing by zero constant does not idealize
+ }
+
+ if (is_power_of_2(divisor)) {
+ return make_urshift<TypeClass>(div->in(1), phase->intcon(log2i_graceful(divisor)));
+ }
+
+ return nullptr;
+}
+
+
//=============================================================================
//------------------------------Identity---------------------------------------
// If the divisor is 1, we are an identity on the dividend.
@@ -873,12 +914,9 @@ const Type* UDivINode::Value(PhaseGVN* phase) const {
//------------------------------Idealize---------------------------------------
Node *UDivINode::Ideal(PhaseGVN *phase, bool can_reshape) {
- // Check for dead control input
- if (in(0) && remove_dead_region(phase, can_reshape)) return this;
- return nullptr;
+ return unsigned_div_ideal<TypeInt, juint>(phase, can_reshape, this);
}
-
//=============================================================================
//------------------------------Identity---------------------------------------
// If the divisor is 1, we are an identity on the dividend.
@@ -912,12 +950,9 @@ const Type* UDivLNode::Value(PhaseGVN* phase) const {
//------------------------------Idealize---------------------------------------
Node *UDivLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
- // Check for dead control input
- if (in(0) && remove_dead_region(phase, can_reshape)) return this;
- return nullptr;
+ return unsigned_div_ideal<TypeLong, julong>(phase, can_reshape, this);
}
-
//=============================================================================
//------------------------------Idealize---------------------------------------
Node *ModINode::Ideal(PhaseGVN *phase, bool can_reshape) {
@@ -1084,12 +1119,98 @@ const Type* ModINode::Value(PhaseGVN* phase) const {
//=============================================================================
//------------------------------Idealize---------------------------------------
-Node *UModINode::Ideal(PhaseGVN *phase, bool can_reshape) {
+
+template <typename TypeClass, typename Unsigned>
+static Node* unsigned_mod_ideal(PhaseGVN* phase, bool can_reshape, Node* mod) {
// Check for dead control input
- if( in(0) && remove_dead_region(phase, can_reshape) ) return this;
+ if (mod->in(0) != nullptr && mod->remove_dead_region(phase, can_reshape)) {
+ return mod;
+ }
+ // Don't bother trying to transform a dead node
+ if (mod->in(0) != nullptr && mod->in(0)->is_top()) {
+ return nullptr;
+ }
+
+ // Get the modulus
+ const Type* t = phase->type(mod->in(2));
+ if (t == Type::TOP) {
+ return nullptr;
+ }
+ const TypeClass* type_divisor = t->cast<TypeClass>();
+
+ // Check for useless control input
+ // Check for excluding mod-zero case
+ if (mod->in(0) != nullptr && (type_divisor->_hi < 0 || type_divisor->_lo > 0)) {
+ mod->set_req(0, nullptr); // Yank control input
+ return mod;
+ }
+
+ if (!type_divisor->is_con()) {
+ return nullptr;
+ }
+ Unsigned divisor = static_cast<Unsigned>(type_divisor->get_con());
+
+ if (divisor == 0) {
+ return nullptr;
+ }
+
+ if (is_power_of_2(divisor)) {
+ return make_and<TypeClass>(mod->in(1), phase->makecon(TypeClass::make(divisor - 1)));
+ }
+
return nullptr;
}
+template <typename TypeClass, typename Unsigned, typename Signed>
+static const Type* unsigned_mod_value(PhaseGVN* phase, const Node* mod) {
+ const Type* t1 = phase->type(mod->in(1));
+ const Type* t2 = phase->type(mod->in(2));
+ if (t1 == Type::TOP) {
+ return Type::TOP;
+ }
+ if (t2 == Type::TOP) {
+ return Type::TOP;
+ }
+
+ // 0 MOD X is 0
+ if (t1 == TypeClass::ZERO) {
+ return TypeClass::ZERO;
+ }
+ // X MOD X is 0
+ if (mod->in(1) == mod->in(2)) {
+ return TypeClass::ZERO;
+ }
+
+ // Either input is BOTTOM ==> the result is the local BOTTOM
+ const Type* bot = mod->bottom_type();
+ if ((t1 == bot) || (t2 == bot) ||
+ (t1 == Type::BOTTOM) || (t2 == Type::BOTTOM)) {
+ return bot;
+ }
+
+ const TypeClass* type_divisor = t2->cast<TypeClass>();
+ if (type_divisor->is_con() && type_divisor->get_con() == 1) {
+ return TypeClass::ZERO;
+ }
+
+ const TypeClass* type_dividend = t1->cast<TypeClass>();
+ if (type_dividend->is_con() && type_divisor->is_con()) {
+ Unsigned dividend = static_cast<Unsigned>(type_dividend->get_con());
+ Unsigned divisor = static_cast<Unsigned>(type_divisor->get_con());
+ return TypeClass::make(static_cast<Signed>(dividend % divisor));
+ }
+
+ return bot;
+}
+
+Node* UModINode::Ideal(PhaseGVN* phase, bool can_reshape) {
+ return unsigned_mod_ideal<TypeInt, juint>(phase, can_reshape, this);
+}
+
+const Type* UModINode::Value(PhaseGVN* phase) const {
+ return unsigned_mod_value<TypeInt, juint, jint>(phase, this);
+}
+
//=============================================================================
//------------------------------Idealize---------------------------------------
Node *ModLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
@@ -1303,11 +1424,12 @@ const Type* ModFNode::Value(PhaseGVN* phase) const {
//=============================================================================
//------------------------------Idealize---------------------------------------
Node *UModLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
- // Check for dead control input
- if( in(0) && remove_dead_region(phase, can_reshape) ) return this;
- return nullptr;
+ return unsigned_mod_ideal<TypeLong, julong>(phase, can_reshape, this);
}
+const Type* UModLNode::Value(PhaseGVN* phase) const {
+ return unsigned_mod_value<TypeLong, julong, jlong>(phase, this);
+}
//=============================================================================
//------------------------------Value------------------------------------------
diff --git a/src/hotspot/share/opto/divnode.hpp b/src/hotspot/share/opto/divnode.hpp
index 70b041cb7af..9258f4cd442 100644
--- a/src/hotspot/share/opto/divnode.hpp
+++ b/src/hotspot/share/opto/divnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 +171,7 @@ class UModINode : public Node {
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
virtual const Type *bottom_type() const { return TypeInt::INT; }
virtual uint ideal_reg() const { return Op_RegI; }
+ virtual const Type* Value(PhaseGVN* phase) const;
};
//------------------------------UModLNode---------------------------------------
@@ -182,6 +183,7 @@ class UModLNode : public Node {
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
virtual const Type *bottom_type() const { return TypeLong::LONG; }
virtual uint ideal_reg() const { return Op_RegL; }
+ virtual const Type* Value(PhaseGVN* phase) const;
};
//------------------------------DivModNode---------------------------------------
diff --git a/src/hotspot/share/opto/gcm.cpp b/src/hotspot/share/opto/gcm.cpp
index c3e0ef811e7..c049d66b795 100644
--- a/src/hotspot/share/opto/gcm.cpp
+++ b/src/hotspot/share/opto/gcm.cpp
@@ -243,7 +243,6 @@ void PhaseCFG::schedule_pinned_nodes(VectorSet &visited) {
}
}
-#ifdef ASSERT
// Assert that new input b2 is dominated by all previous inputs.
// Check this by by seeing that it is dominated by b1, the deepest
// input observed until b2.
@@ -255,6 +254,7 @@ static void assert_dom(Block* b1, Block* b2, Node* n, const PhaseCFG* cfg) {
tmp = tmp->_idom;
}
if (tmp != b1) {
+#ifdef ASSERT
// Detected an unschedulable graph. Print some nice stuff and die.
tty->print_cr("!!! Unschedulable graph !!!");
for (uint j=0; j<n->len(); j++) { // For all inputs
@@ -267,10 +267,11 @@ static void assert_dom(Block* b1, Block* b2, Node* n, const PhaseCFG* cfg) {
}
tty->print("Failing node: ");
n->dump();
- assert(false, "unscheduable graph");
+ assert(false, "unschedulable graph");
+#endif
+ cfg->C->record_failure("unschedulable graph");
}
}
-#endif
static Block* find_deepest_input(Node* n, const PhaseCFG* cfg) {
// Find the last input dominated by all other inputs.
@@ -285,7 +286,10 @@ static Block* find_deepest_input(Node* n, const PhaseCFG* cfg) {
// The new inb must be dominated by the previous deepb.
// The various inputs must be linearly ordered in the dom
// tree, or else there will not be a unique deepest block.
- DEBUG_ONLY(assert_dom(deepb, inb, n, cfg));
+ assert_dom(deepb, inb, n, cfg);
+ if (cfg->C->failing()) {
+ return nullptr;
+ }
deepb = inb; // Save deepest block
deepb_dom_depth = deepb->_dom_depth;
}
@@ -372,6 +376,9 @@ bool PhaseCFG::schedule_early(VectorSet &visited, Node_Stack &roots) {
if (!parent_node->pinned()) {
// Set earliest legal block.
Block* earliest_block = find_deepest_input(parent_node, this);
+ if (C->failing()) {
+ return false;
+ }
map_node_to_block(parent_node, earliest_block);
} else {
assert(get_block_for_node(parent_node) == get_block_for_node(parent_node->in(0)), "Pinned Node should be at the same block as its control edge");
@@ -523,7 +530,10 @@ static Block* memory_early_block(Node* load, Block* early, const PhaseCFG* cfg)
// The new inb must be dominated by the previous deepb.
// The various inputs must be linearly ordered in the dom
// tree, or else there will not be a unique deepest block.
- DEBUG_ONLY(assert_dom(deepb, inb, load, cfg));
+ assert_dom(deepb, inb, load, cfg);
+ if (cfg->C->failing()) {
+ return nullptr;
+ }
deepb = inb; // Save deepest block
deepb_dom_depth = deepb->_dom_depth;
}
@@ -715,6 +725,9 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
// dominator tree, and allow for a broader discovery of anti-dependences.
if (C->subsume_loads()) {
early = memory_early_block(load, early, this);
+ if (C->failing()) {
+ return nullptr;
+ }
}
ResourceArea* area = Thread::current()->resource_area();
@@ -1522,6 +1535,9 @@ void PhaseCFG::schedule_late(VectorSet &visited, Node_Stack &stack) {
// Hoist LCA above possible-defs and insert anti-dependences to
// defs in new LCA block.
LCA = insert_anti_dependences(LCA, self);
+ if (C->failing()) {
+ return;
+ }
}
if (early->_dom_depth > LCA->_dom_depth) {
@@ -1614,8 +1630,8 @@ void PhaseCFG::global_code_motion() {
Node_Stack stack((C->live_nodes() >> 2) + 16); // pre-grow
if (!schedule_early(visited, stack)) {
// Bailout without retry
- assert(false, "early schedule failed");
- C->record_method_not_compilable("early schedule failed");
+ assert(C->failure_is_artificial(), "early schedule failed");
+ C->record_method_not_compilable("early schedule failed" DEBUG_ONLY(COMMA true));
return;
}
@@ -1660,6 +1676,9 @@ void PhaseCFG::global_code_motion() {
// uncommon trap. Combined with the too_many_traps guards
// above, this prevents SEGV storms reported in 6366351,
// by recompiling offending methods without this optimization.
+ if (C->failing()) {
+ return;
+ }
}
}
@@ -1729,6 +1748,9 @@ void PhaseCFG::global_code_motion() {
for (uint i = 0; i < number_of_blocks(); i++) {
Block* block = get_block(i);
call_catch_cleanup(block);
+ if (C->failing()) {
+ return;
+ }
}
#ifndef PRODUCT
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index 61be117d9d9..28d632e1cea 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -893,7 +893,7 @@ class GraphKit : public Phase {
// Vector API support (implemented in vectorIntrinsics.cpp)
Node* box_vector(Node* in, const TypeInstPtr* vbox_type, BasicType elem_bt, int num_elem, bool deoptimize_on_exception = false);
- Node* unbox_vector(Node* in, const TypeInstPtr* vbox_type, BasicType elem_bt, int num_elem, bool shuffle_to_vector = false);
+ Node* unbox_vector(Node* in, const TypeInstPtr* vbox_type, BasicType elem_bt, int num_elem);
Node* vector_shift_count(Node* cnt, int shift_op, BasicType bt, int num_elem);
};
diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index ec9233935e7..42726a34d01 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp
index b6794667911..042ac694843 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.hpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/idealKit.hpp b/src/hotspot/share/opto/idealKit.hpp
index b7aacb8fb38..9a988637f9d 100644
--- a/src/hotspot/share/opto/idealKit.hpp
+++ b/src/hotspot/share/opto/idealKit.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 7f74da7b372..7918edc9e3a 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index 7a555fea03a..233c4ced8b9 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -519,6 +519,9 @@ void PhaseCFG::implicit_null_check(Block* block, Node *proj, Node *val, int allo
n->in(LoadNode::Memory) == best->in(StoreNode::Memory)) {
// Found anti-dependent load
insert_anti_dependences(block, n);
+ if (C->failing()) {
+ return;
+ }
}
}
}
@@ -1389,6 +1392,9 @@ void PhaseCFG::call_catch_cleanup(Block* block) {
map_node_to_block(clone, sb);
if (clone->needs_anti_dependence_check()) {
insert_anti_dependences(sb, clone);
+ if (C->failing()) {
+ return;
+ }
}
}
}
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 926ac6b5365..741b30dacfe 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -719,14 +719,8 @@ bool LibraryCallKit::try_to_inline(int predicate) {
return inline_vector_nary_operation(3);
case vmIntrinsics::_VectorFromBitsCoerced:
return inline_vector_frombits_coerced();
- case vmIntrinsics::_VectorShuffleIota:
- return inline_vector_shuffle_iota();
case vmIntrinsics::_VectorMaskOp:
return inline_vector_mask_operation();
- case vmIntrinsics::_VectorShuffleToVector:
- return inline_vector_shuffle_to_vector();
- case vmIntrinsics::_VectorWrapShuffleIndexes:
- return inline_vector_wrap_shuffle_indexes();
case vmIntrinsics::_VectorLoadOp:
return inline_vector_mem_operation(/*is_store=*/false);
case vmIntrinsics::_VectorLoadMaskedOp:
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index a8218184710..745ba0c9778 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -378,10 +378,6 @@ class LibraryCallKit : public GraphKit {
// Vector API support
bool inline_vector_nary_operation(int n);
bool inline_vector_frombits_coerced();
- bool inline_vector_shuffle_to_vector();
- bool inline_vector_wrap_shuffle_indexes();
- bool inline_vector_shuffle_iota();
- Node* partially_wrap_indexes(Node* index_vec, int num_elem, BasicType type_bt);
bool inline_vector_mask_operation();
bool inline_vector_mem_operation(bool is_store);
bool inline_vector_mem_masked_operation(bool is_store);
diff --git a/src/hotspot/share/opto/live.cpp b/src/hotspot/share/opto/live.cpp
index 7378f36df50..7112d7aaaf0 100644
--- a/src/hotspot/share/opto/live.cpp
+++ b/src/hotspot/share/opto/live.cpp
@@ -277,7 +277,7 @@ void PhaseLive::add_liveout(Block_List& worklist, Block* p, IndexSet* lo, Vector
// Add a vector of live-in values to a given blocks live-in set.
void PhaseLive::add_livein(Block *p, IndexSet *lo) {
IndexSet *livein = &_livein[p->_pre_order-1];
- if (!livein->is_empty()) {
+ if (!lo->is_empty()) {
IndexSetIterator elements(lo);
uint r;
while ((r = elements.next()) != 0) {
diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index 9340f7e0978..02649d3711a 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -766,8 +766,7 @@ BoolNode* PhaseIdealLoop::rc_predicate(Node* ctrl, const int scale, Node* offset
if ((stride > 0 && (java_subtract(limit_lo, stride) < limit_lo)) ||
(stride < 0 && (java_subtract(limit_hi, stride) > limit_hi))) {
// No overflow possible
- ConINode* con_stride = _igvn.intcon(stride);
- set_ctrl(con_stride, C->root());
+ ConINode* con_stride = intcon(stride);
max_idx_expr = new SubINode(limit, con_stride);
idx_type = TypeInt::make(limit_lo - stride, limit_hi - stride, limit_type->_widen);
} else {
@@ -775,8 +774,7 @@ BoolNode* PhaseIdealLoop::rc_predicate(Node* ctrl, const int scale, Node* offset
overflow = true;
limit = new ConvI2LNode(limit);
register_new_node(limit, ctrl);
- ConLNode* con_stride = _igvn.longcon(stride);
- set_ctrl(con_stride, C->root());
+ ConLNode* con_stride = longcon(stride);
max_idx_expr = new SubLNode(limit, con_stride);
}
register_new_node(max_idx_expr, ctrl);
@@ -793,8 +791,7 @@ BoolNode* PhaseIdealLoop::rc_predicate(Node* ctrl, const int scale, Node* offset
}
if (scale != 1) {
- ConNode* con_scale = _igvn.intcon(scale);
- set_ctrl(con_scale, C->root());
+ ConNode* con_scale = intcon(scale);
if (TraceLoopPredicate) {
predString->print("* %d ", scale);
}
@@ -811,8 +808,7 @@ BoolNode* PhaseIdealLoop::rc_predicate(Node* ctrl, const int scale, Node* offset
register_new_node(max_idx_expr, ctrl);
}
overflow = true;
- con_scale = _igvn.longcon(scale);
- set_ctrl(con_scale, C->root());
+ con_scale = longcon(scale);
max_idx_expr = new MulLNode(max_idx_expr, con_scale);
} else {
// No overflow possible
@@ -1342,8 +1338,7 @@ bool PhaseIdealLoop::loop_predication_impl(IdealLoopTree* loop) {
#endif
return false;
}
- ConNode* zero = _igvn.intcon(0);
- set_ctrl(zero, C->root());
+ ConNode* zero = intcon(0);
ResourceArea* area = Thread::current()->resource_area();
Invariance invar(area, loop);
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index f644e26bbe7..a33d89993ad 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -354,15 +354,11 @@ Node* IdealLoopTree::reassociate_add_sub_cmp(Node* n1, int inv1_idx, int inv2_id
Node* inv1_c = phase->get_ctrl(inv1);
Node* n_inv1;
if (neg_inv1) {
- Node* zero;
if (is_int) {
- zero = phase->_igvn.intcon(0);
- n_inv1 = new SubINode(zero, inv1);
+ n_inv1 = new SubINode(phase->intcon(0), inv1);
} else {
- zero = phase->_igvn.longcon(0L);
- n_inv1 = new SubLNode(zero, inv1);
+ n_inv1 = new SubLNode(phase->longcon(0L), inv1);
}
- phase->set_ctrl(zero, phase->C->root());
phase->register_new_node(n_inv1, inv1_c);
} else {
n_inv1 = inv1;
@@ -1711,8 +1707,7 @@ void PhaseIdealLoop::update_main_loop_assertion_predicates(CountedLoopNode* main
// Compute the value of the loop induction variable at the end of the
// first iteration of the unrolled loop: init + new_stride_con - init_inc
int unrolled_stride_con = main_loop_head->stride_con() * 2;
- Node* unrolled_stride = _igvn.intcon(unrolled_stride_con);
- set_ctrl(unrolled_stride, C->root());
+ Node* unrolled_stride = intcon(unrolled_stride_con);
Node* loop_entry = main_loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
PredicateIterator predicate_iterator(loop_entry);
@@ -1879,23 +1874,20 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
if (limit->is_Con()) {
// The check in policy_unroll and the assert above guarantee
// no underflow if limit is constant.
- new_limit = _igvn.intcon(limit->get_int() - stride_con);
- set_ctrl(new_limit, C->root());
+ new_limit = intcon(limit->get_int() - stride_con);
} else {
// Limit is not constant. Int subtraction could lead to underflow.
// (1) Convert to long.
Node* limit_l = new ConvI2LNode(limit);
register_new_node_with_ctrl_of(limit_l, limit);
- Node* stride_l = _igvn.longcon(stride_con);
- set_ctrl(stride_l, C->root());
+ Node* stride_l = longcon(stride_con);
// (2) Subtract: compute in long, to prevent underflow.
Node* new_limit_l = new SubLNode(limit_l, stride_l);
register_new_node(new_limit_l, ctrl);
// (3) Clamp to int range, in case we had subtraction underflow.
- Node* underflow_clamp_l = _igvn.longcon((stride_con > 0) ? min_jint : max_jint);
- set_ctrl(underflow_clamp_l, C->root());
+ Node* underflow_clamp_l = longcon((stride_con > 0) ? min_jint : max_jint);
Node* new_limit_no_underflow_l = nullptr;
if (stride_con > 0) {
// limit = MaxL(limit - stride, min_jint)
@@ -1985,8 +1977,7 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
// Kill the clone's backedge
Node *newcle = old_new[loop_end->_idx];
_igvn.hash_delete(newcle);
- Node *one = _igvn.intcon(1);
- set_ctrl(one, C->root());
+ Node* one = intcon(1);
newcle->set_req(1, one);
// Force clone into same loop body
uint max = loop->_body.size();
@@ -2122,8 +2113,7 @@ void PhaseIdealLoop::add_constraint(jlong stride_con, jlong scale_con, Node* off
// Only do this for the pre-loop, one less iteration of the main loop doesn't hurt.
bool round = ABS(scale_con) > 1;
- Node* scale = _igvn.longcon(scale_con);
- set_ctrl(scale, C->root());
+ Node* scale = longcon(scale_con);
if ((stride_con^scale_con) >= 0) { // Use XOR to avoid overflow
// Positive stride*scale: the affine function is increasing,
@@ -2162,8 +2152,7 @@ void PhaseIdealLoop::add_constraint(jlong stride_con, jlong scale_con, Node* off
// else /* scale > 0 and stride < 0 */
// I > (upper_limit-(offset+1))/scale
// )
- Node* one = _igvn.longcon(1);
- set_ctrl(one, C->root());
+ Node* one = longcon(1);
Node* plus_one = new AddLNode(offset, one);
register_new_node(plus_one, pre_ctrl);
*pre_limit = adjust_limit(!is_positive_stride, scale, plus_one, upper_limit, *pre_limit, pre_ctrl, round);
@@ -2368,8 +2357,7 @@ bool PhaseIdealLoop::is_scaled_iv_plus_offset(Node* exp, Node* iv, BasicType bt,
*p_scale = scale;
}
if (p_offset != nullptr) {
- Node *zero = _igvn.zerocon(bt);
- set_ctrl(zero, C->root());
+ Node* zero = zerocon(bt);
*p_offset = zero;
}
return true;
@@ -2420,8 +2408,7 @@ bool PhaseIdealLoop::is_scaled_iv_plus_offset(Node* exp, Node* iv, BasicType bt,
}
if (p_offset != nullptr) {
if (which == 1) { // must negate the extracted offset
- Node *zero = _igvn.integercon(0, exp_bt);
- set_ctrl(zero, C->root());
+ Node* zero = integercon(0, exp_bt);
Node *ctrl_off = get_ctrl(offset);
offset = SubNode::make(zero, offset, exp_bt);
register_new_node(offset, ctrl_off);
@@ -2463,7 +2450,7 @@ bool PhaseIdealLoop::is_scaled_iv_plus_extra_offset(Node* exp1, Node* offset3, N
//------------------------------do_range_check---------------------------------
// Eliminate range-checks and other trip-counter vs loop-invariant tests.
-void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
+void PhaseIdealLoop::do_range_check(IdealLoopTree* loop) {
#ifndef PRODUCT
if (PrintOpto && VerifyLoopOptimizations) {
tty->print("Range Check Elimination ");
@@ -2526,8 +2513,9 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
// Range check elimination optimizes out conditions whose parameters are loop invariant in the main loop. They usually
// have control above the pre loop, but there's no guarantee that they do. There's no guarantee either that the pre
// loop limit has control that's out of loop (a previous round of range check elimination could have set a limit that's
- // not loop invariant).
- Node* new_limit_ctrl = dominated_node(pre_ctrl, pre_limit_ctrl);
+ // not loop invariant). new_limit_ctrl is used for both the pre and main loops. Early control for the main limit may be
+ // below the pre loop entry and the pre limit and must be taken into account when initializing new_limit_ctrl.
+ Node* new_limit_ctrl = dominated_node(pre_ctrl, pre_limit_ctrl, compute_early_ctrl(main_limit, main_limit_ctrl));
// Ensure the original loop limit is available from the
// pre-loop Opaque1 node.
@@ -2539,13 +2527,10 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
int stride_con = cl->stride_con();
bool abs_stride_is_one = stride_con == 1 || stride_con == -1;
- Node* zero = _igvn.longcon(0);
- Node* one = _igvn.longcon(1);
+ Node* zero = longcon(0);
+ Node* one = longcon(1);
// Use symmetrical int range [-max_jint,max_jint]
- Node* mini = _igvn.longcon(-max_jint);
- set_ctrl(zero, C->root());
- set_ctrl(one, C->root());
- set_ctrl(mini, C->root());
+ Node* mini = longcon(-max_jint);
Node* loop_entry = cl->skip_strip_mined()->in(LoopNode::EntryControl);
assert(loop_entry->is_Proj() && loop_entry->in(0)->is_If(), "if projection only");
@@ -2744,8 +2729,7 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
// Kill the eliminated test
C->set_major_progress();
- Node *kill_con = _igvn.intcon(1-flip);
- set_ctrl(kill_con, C->root());
+ Node* kill_con = intcon(1-flip);
_igvn.replace_input_of(iff, 1, kill_con);
// Find surviving projection
assert(iff->is_If(), "");
@@ -2778,8 +2762,10 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
// new pre_limit can push Bool/Cmp/Opaque nodes down (when one of the eliminated condition has parameters that are not
// loop invariant in the pre loop.
set_ctrl(pre_opaq, new_limit_ctrl);
- set_ctrl(pre_end->cmp_node(), new_limit_ctrl);
- set_ctrl(pre_end->in(1), new_limit_ctrl);
+ // Can't use new_limit_ctrl for Bool/Cmp because it can be out of loop while they are loop variant. Conservatively set
+ // control to latest possible one.
+ set_ctrl(pre_end->cmp_node(), pre_end->in(0));
+ set_ctrl(pre_end->in(1), pre_end->in(0));
_igvn.replace_input_of(pre_opaq, 1, pre_limit);
@@ -2819,11 +2805,12 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
// The OpaqueNode is unshared by design
assert(opqzm->outcnt() == 1, "cannot hack shared node");
_igvn.replace_input_of(opqzm, 1, main_limit);
- // new main_limit can push Bool/Cmp nodes down (when one of the eliminated condition has parameters that are not loop
- // invariant in the pre loop.
+ // new main_limit can push opaque node for zero trip guard down (when one of the eliminated condition has parameters
+ // that are not loop invariant in the pre loop).
set_ctrl(opqzm, new_limit_ctrl);
- set_ctrl(iffm->in(1)->in(1), new_limit_ctrl);
- set_ctrl(iffm->in(1), new_limit_ctrl);
+ // Bool/Cmp nodes for zero trip guard should have been assigned control between the main and pre loop (because zero
+ // trip guard depends on induction variable value out of pre loop) so shouldn't need to be adjusted
+ assert(is_dominator(new_limit_ctrl, get_ctrl(iffm->in(1)->in(1))), "control of cmp should be below control of updated input");
C->print_method(PHASE_AFTER_RANGE_CHECK_ELIMINATION, 4, cl);
}
@@ -3402,7 +3389,7 @@ bool IdealLoopTree::iteration_split_impl(PhaseIdealLoop *phase, Node_List &old_n
// with full checks, but the main-loop with no checks. Remove said checks
// from the main body.
if (should_rce) {
- phase->do_range_check(this, old_new);
+ phase->do_range_check(this);
}
// Double loop body for unrolling. Adjust the minimum-trip test (will do
diff --git a/src/hotspot/share/opto/loopUnswitch.cpp b/src/hotspot/share/opto/loopUnswitch.cpp
index b568b5ee528..29d0e901667 100644
--- a/src/hotspot/share/opto/loopUnswitch.cpp
+++ b/src/hotspot/share/opto/loopUnswitch.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index e52f31b1e11..72870613cb0 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -313,8 +313,7 @@ IdealLoopTree* PhaseIdealLoop::insert_outer_loop(IdealLoopTree* loop, LoopNode*
IdealLoopTree* PhaseIdealLoop::create_outer_strip_mined_loop(BoolNode *test, Node *cmp, Node *init_control,
IdealLoopTree* loop, float cl_prob, float le_fcnt,
Node*& entry_control, Node*& iffalse) {
- Node* outer_test = _igvn.intcon(0);
- set_ctrl(outer_test, C->root());
+ Node* outer_test = intcon(0);
Node *orig = iffalse;
iffalse = iffalse->clone();
_igvn.register_new_node_with_optimizer(iffalse);
@@ -969,16 +968,14 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
inner_iters_actual_int = inner_iters_actual;
}
- Node* int_zero = _igvn.intcon(0);
- set_ctrl(int_zero, C->root());
+ Node* int_zero = intcon(0);
if (stride_con < 0) {
inner_iters_actual_int = new SubINode(int_zero, inner_iters_actual_int);
_igvn.register_new_node_with_optimizer(inner_iters_actual_int);
}
// Clone the iv data nodes as an integer iv
- Node* int_stride = _igvn.intcon(stride_con);
- set_ctrl(int_stride, C->root());
+ Node* int_stride = intcon(stride_con);
Node* inner_phi = new PhiNode(x->in(0), TypeInt::INT);
Node* inner_incr = new AddINode(inner_phi, int_stride);
Node* inner_cmp = nullptr;
@@ -1273,14 +1270,10 @@ int PhaseIdealLoop::extract_long_range_checks(const IdealLoopTree* loop, jint st
void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List &range_checks, Node* outer_phi,
Node* inner_iters_actual_int, Node* inner_phi,
Node* iv_add, LoopNode* inner_head) {
- Node* long_zero = _igvn.longcon(0);
- set_ctrl(long_zero, C->root());
- Node* int_zero = _igvn.intcon(0);
- set_ctrl(int_zero, this->C->root());
- Node* long_one = _igvn.longcon(1);
- set_ctrl(long_one, this->C->root());
- Node* int_stride = _igvn.intcon(checked_cast<int>(stride_con));
- set_ctrl(int_stride, this->C->root());
+ Node* long_zero = longcon(0);
+ Node* int_zero = intcon(0);
+ Node* long_one = longcon(1);
+ Node* int_stride = intcon(checked_cast<int>(stride_con));
for (uint i = 0; i < range_checks.size(); i++) {
ProjNode* proj = range_checks.at(i)->as_Proj();
@@ -1302,8 +1295,7 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
Node* entry_control = inner_head->in(LoopNode::EntryControl);
Node* R = range;
- Node* K = _igvn.longcon(scale);
- set_ctrl(K, this->C->root());
+ Node* K = longcon(scale);
Node* L = offset;
@@ -1334,8 +1326,7 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
// So this transformation could cause spurious deoptimizations and failed range check elimination
// (but not incorrect execution) for unlikely corner cases with overflow.
// If this causes problems in practice, we could maybe direct execution to a post-loop, instead of deoptimizing.
- Node* max_jint_plus_one_long = _igvn.longcon((jlong)max_jint + 1);
- set_ctrl(max_jint_plus_one_long, C->root());
+ Node* max_jint_plus_one_long = longcon((jlong)max_jint + 1);
Node* max_range = new AddLNode(max_jint_plus_one_long, L);
register_new_node(max_range, entry_control);
R = MaxNode::unsigned_min(R, max_range, TypeLong::POS, _igvn);
@@ -1389,8 +1380,7 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
// H_clamp = Q_max+1 < Q_min ? max_jlong : Q_max+1
// (Because Q_min and Q_max are close, the overflow check could also be encoded as Q_max+1 < 0 & Q_min >= 0.)
- Node* max_jlong_long = _igvn.longcon(max_jlong);
- set_ctrl(max_jlong_long, this->C->root());
+ Node* max_jlong_long = longcon(max_jlong);
Node* Q_max_cmp = new CmpLNode(Q_max_plus_one, Q_min);
register_new_node(Q_max_cmp, entry_control);
Node* Q_max_bool = new BoolNode(Q_max_cmp, BoolTest::lt);
@@ -1424,8 +1414,7 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
// to: j*K + L_2 <u32 R_2
// that is:
// (j*K + Q_first) - L_clamp <u32 clamp(R, L_clamp, H_clamp) - L_clamp
- K = _igvn.intcon(checked_cast<int>(scale));
- set_ctrl(K, this->C->root());
+ K = intcon(checked_cast<int>(scale));
Node* scaled_iv = new MulINode(inner_phi, K);
register_new_node(scaled_iv, c);
Node* scaled_iv_plus_offset = new AddINode(scaled_iv, L_2);
@@ -3155,7 +3144,7 @@ void OuterStripMinedLoopNode::transform_to_counted_loop(PhaseIterGVN* igvn, Phas
// make counted loop exit test always fail
ConINode* zero = igvn->intcon(0);
if (iloop != nullptr) {
- iloop->set_ctrl(zero, igvn->C->root());
+ iloop->set_root_as_ctrl(zero);
}
igvn->replace_input_of(cle, 1, zero);
// replace outer loop end with CountedLoopEndNode with formers' CLE's exit test
@@ -4067,8 +4056,7 @@ void PhaseIdealLoop::replace_parallel_iv(IdealLoopTree *loop) {
// variable differs from the trip counter by a loop-invariant
// amount, the difference between their respective initial values.
// It is scaled by the 'ratio_con'.
- Node* ratio = _igvn.integercon(ratio_con, stride_con2_bt);
- set_ctrl(ratio, C->root());
+ Node* ratio = integercon(ratio_con, stride_con2_bt);
Node* init_converted = insert_convert_node_if_needed(stride_con2_bt, init);
Node* phi_converted = insert_convert_node_if_needed(stride_con2_bt, phi);
@@ -4488,8 +4476,7 @@ void PhaseIdealLoop::eliminate_useless_template_assertion_predicates(Unique_Node
OpaqueTemplateAssertionPredicateNode* opaque_node =
C->template_assertion_predicate_opaq_node(i - 1)->as_OpaqueTemplateAssertionPredicate();
if (!useful_predicates.member(opaque_node)) { // not in the useful list
- ConINode* one = _igvn.intcon(1);
- set_ctrl(one, C->root());
+ ConINode* one = intcon(1);
_igvn.replace_node(opaque_node, one);
}
}
@@ -4899,7 +4886,10 @@ void PhaseIdealLoop::build_and_optimize() {
// that require basic-block info (like cloning through Phi's)
if (!C->major_progress() && SplitIfBlocks && do_split_ifs) {
visited.clear();
- split_if_with_blocks( visited, nstack);
+ split_if_with_blocks(visited, nstack);
+ if (C->failing()) {
+ return;
+ }
DEBUG_ONLY( if (VerifyLoopOptimizations) { verify(); } );
}
@@ -6423,6 +6413,7 @@ void PhaseIdealLoop::build_loop_late_post_work(Node *n, bool pinned) {
#ifdef ASSERT
if (_verify_only && !n->is_CFG()) {
// Check def-use domination.
+ // We would like to expose this check in product but it appears to be expensive.
compute_lca_of_uses(n, get_ctrl(n), true /* verify */);
}
#endif
@@ -6866,6 +6857,36 @@ void PhaseIdealLoop::rpo(Node* start, Node_Stack &stk, VectorSet &visited, Node_
}
}
+ConINode* PhaseIdealLoop::intcon(jint i) {
+ ConINode* node = _igvn.intcon(i);
+ set_root_as_ctrl(node);
+ return node;
+}
+
+ConLNode* PhaseIdealLoop::longcon(jlong i) {
+ ConLNode* node = _igvn.longcon(i);
+ set_root_as_ctrl(node);
+ return node;
+}
+
+ConNode* PhaseIdealLoop::makecon(const Type* t) {
+ ConNode* node = _igvn.makecon(t);
+ set_root_as_ctrl(node);
+ return node;
+}
+
+ConNode* PhaseIdealLoop::integercon(jlong l, BasicType bt) {
+ ConNode* node = _igvn.integercon(l, bt);
+ set_root_as_ctrl(node);
+ return node;
+}
+
+ConNode* PhaseIdealLoop::zerocon(BasicType bt) {
+ ConNode* node = _igvn.zerocon(bt);
+ set_root_as_ctrl(node);
+ return node;
+}
+
//=============================================================================
//------------------------------LoopTreeIterator-------------------------------
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index ec4c8d83f43..b4f9db325a9 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -985,6 +985,10 @@ class PhaseIdealLoop : public PhaseTransform {
assert( ctrl == find_non_split_ctrl(ctrl), "must set legal crtl" );
_loop_or_ctrl.map(n->_idx, (Node*)((intptr_t)ctrl + 1));
}
+ void set_root_as_ctrl(Node* n) {
+ assert(!has_node(n) || has_ctrl(n), "");
+ _loop_or_ctrl.map(n->_idx, (Node*)((intptr_t)C->root() + 1));
+ }
// Set control and update loop membership
void set_ctrl_and_loop(Node* n, Node* ctrl) {
IdealLoopTree* old_loop = get_loop(get_ctrl(n));
@@ -1421,7 +1425,7 @@ class PhaseIdealLoop : public PhaseTransform {
}
// Eliminate range-checks and other trip-counter vs loop-invariant tests.
- void do_range_check(IdealLoopTree *loop, Node_List &old_new);
+ void do_range_check(IdealLoopTree* loop);
// Clone loop with an invariant test (that does not exit) and
// insert a clone of the test that selects which version to
@@ -1795,6 +1799,16 @@ class PhaseIdealLoop : public PhaseTransform {
void collect_flat_array_checks(const IdealLoopTree* loop, Node_List& flat_array_checks) const;
Node* ensure_node_and_inputs_are_above_pre_end(CountedLoopEndNode* pre_end, Node* node);
+
+ ConINode* intcon(jint i);
+
+ ConLNode* longcon(jlong i);
+
+ ConNode* makecon(const Type* t);
+
+ ConNode* integercon(jlong l, BasicType bt);
+
+ ConNode* zerocon(BasicType bt);
};
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index dc9f8987420..7a292011d13 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -129,7 +129,7 @@ Node* PhaseIdealLoop::split_thru_phi(Node* n, Node* region, int policy) {
if (singleton) {
wins++;
- x = ((PhaseGVN&)_igvn).makecon(t);
+ x = makecon(t);
} else {
// We now call Identity to try to simplify the cloned node.
// Note that some Identity methods call phase->type(this).
@@ -196,8 +196,7 @@ Node* PhaseIdealLoop::split_thru_phi(Node* n, Node* region, int policy) {
IdealLoopTree *old_loop;
if (x->is_Con()) {
- // Constant's control is always root.
- set_ctrl(x, C->root());
+ assert(get_ctrl(x) == C->root(), "constant control is not root");
continue;
}
// The occasional new node
@@ -286,10 +285,14 @@ bool PhaseIdealLoop::cannot_split_division(const Node* n, const Node* region) co
switch (n->Opcode()) {
case Op_DivI:
case Op_ModI:
+ case Op_UDivI:
+ case Op_UModI:
zero = TypeInt::ZERO;
break;
case Op_DivL:
case Op_ModL:
+ case Op_UDivL:
+ case Op_UModL:
zero = TypeLong::ZERO;
break;
default:
@@ -338,8 +341,7 @@ void PhaseIdealLoop::dominated_by(IfProjNode* prevdom, IfNode* iff, bool flip, b
pop = Op_IfTrue;
}
// 'con' is set to true or false to kill the dominated test.
- Node *con = _igvn.makecon(pop == Op_IfTrue ? TypeInt::ONE : TypeInt::ZERO);
- set_ctrl(con, C->root()); // Constant gets a new use
+ Node* con = makecon(pop == Op_IfTrue ? TypeInt::ONE : TypeInt::ZERO);
// Hack the dominated test
_igvn.replace_input_of(iff, 1, con);
@@ -479,8 +481,7 @@ Node* PhaseIdealLoop::remix_address_expressions_add_left_shift(Node* n, IdealLoo
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* zero = integercon(0, bt);
Node* neg = SubNode::make(zero, add->in(2), bt);
register_new_node_with_ctrl_of(neg, add->in(2));
add = AddNode::make(add->in(1), neg, bt);
@@ -1715,6 +1716,9 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
}
try_sink_out_of_loop(n);
+ if (C->failing()) {
+ return;
+ }
try_move_store_after_loop(n);
@@ -1907,7 +1911,11 @@ void PhaseIdealLoop::try_sink_out_of_loop(Node* n) {
Node* early_ctrl = compute_early_ctrl(n, n_ctrl);
if (n_loop->is_member(get_loop(early_ctrl)) && // check that this one can't be hoisted now
ctrl_of_all_uses_out_of_loop(n, early_ctrl, n_loop)) { // All uses in outer loops!
- assert(!n->is_Store() && !n->is_LoadStore(), "no node with a side effect");
+ if (n->is_Store() || n->is_LoadStore()) {
+ assert(false, "no node with a side effect");
+ C->record_failure("no node with a side effect");
+ return;
+ }
Node* outer_loop_clone = nullptr;
for (DUIterator_Last jmin, j = n->last_outs(jmin); j >= jmin;) {
Node* u = n->last_out(j); // Clone private computation per use
@@ -2155,6 +2163,9 @@ void PhaseIdealLoop::split_if_with_blocks(VectorSet &visited, Node_Stack &nstack
if (cnt != 0 && !n->is_Con()) {
assert(has_node(n), "no dead nodes");
split_if_with_blocks_post(n);
+ if (C->failing()) {
+ return;
+ }
}
if (must_throttle_split_if()) {
nstack.clear();
@@ -3085,8 +3096,7 @@ Node* PhaseIdealLoop::short_circuit_if(IfNode* iff, ProjNode* live_proj) {
guarantee(live_proj != nullptr, "null projection");
int proj_con = live_proj->_con;
assert(proj_con == 0 || proj_con == 1, "false or true projection");
- Node *con = _igvn.intcon(proj_con);
- set_ctrl(con, C->root());
+ Node* con = intcon(proj_con);
if (iff) {
iff->set_req(1, con);
}
@@ -3395,8 +3405,7 @@ IfNode* PhaseIdealLoop::insert_cmpi_loop_exit(IfNode* if_cmpu, IdealLoopTree* lo
if (stride > 0) {
rhs_cmpi = limit; // For i >= limit
} else {
- rhs_cmpi = _igvn.makecon(TypeInt::ZERO); // For i < 0
- set_ctrl(rhs_cmpi, C->root());
+ rhs_cmpi = makecon(TypeInt::ZERO); // For i < 0
}
// Create a new region on the exit path
RegionNode* reg = insert_region_before_proj(lp_exit);
@@ -3425,8 +3434,7 @@ void PhaseIdealLoop::remove_cmpi_loop_exit(IfNode* if_cmp, IdealLoopTree *loop)
assert(if_cmp->in(1)->in(1)->Opcode() == Op_CmpI &&
stay_in_loop(lp_proj, loop)->is_If() &&
stay_in_loop(lp_proj, loop)->in(1)->in(1)->Opcode() == Op_CmpU, "inserted cmpi before cmpu");
- Node *con = _igvn.makecon(lp_proj->is_IfTrue() ? TypeInt::ONE : TypeInt::ZERO);
- set_ctrl(con, C->root());
+ Node* con = makecon(lp_proj->is_IfTrue() ? TypeInt::ONE : TypeInt::ZERO);
if_cmp->set_req(1, con);
}
@@ -4808,7 +4816,7 @@ void PhaseIdealLoop::move_unordered_reduction_out_of_loop(IdealLoopTree* loop) {
assert(first_ur != nullptr, "must have successfully terminated chain traversal");
Node* identity_scalar = ReductionNode::make_identity_con_scalar(_igvn, sopc, bt);
- set_ctrl(identity_scalar, C->root());
+ set_root_as_ctrl(identity_scalar);
VectorNode* identity_vector = VectorNode::scalar2vector(identity_scalar, vector_length, bt);
register_new_node(identity_vector, C->root());
assert(vec_t == identity_vector->vect_type(), "matching vector type");
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index a79efb9cbbe..cc7b1ccc3c9 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -1794,18 +1794,19 @@ Node* Matcher::Label_Root(const Node* n, State* svec, Node* control, Node*& mem)
// Call DFA to match this node, and return
svec->DFA( n->Opcode(), n );
-#ifdef ASSERT
uint x;
for( x = 0; x < _LAST_MACH_OPER; x++ )
if( svec->valid(x) )
break;
if (x >= _LAST_MACH_OPER) {
+#ifdef ASSERT
n->dump();
svec->dump();
+#endif
assert( false, "bad AD file" );
+ C->record_failure("bad AD file");
}
-#endif
return control;
}
diff --git a/src/hotspot/share/opto/matcher.hpp b/src/hotspot/share/opto/matcher.hpp
index 482202fc996..bc34865cbef 100644
--- a/src/hotspot/share/opto/matcher.hpp
+++ b/src/hotspot/share/opto/matcher.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -343,6 +343,8 @@ class Matcher : public PhaseTransform {
static bool vector_needs_partial_operations(Node* node, const TypeVect* vt);
+ static bool vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen);
+
static const RegMask* predicate_reg_mask(void);
// Vector width in bytes
diff --git a/src/hotspot/share/opto/mulnode.hpp b/src/hotspot/share/opto/mulnode.hpp
index 4c5e3e33248..c8d168685d9 100644
--- a/src/hotspot/share/opto/mulnode.hpp
+++ b/src/hotspot/share/opto/mulnode.hpp
@@ -226,6 +226,19 @@ class AndLNode : public MulLNode {
virtual uint ideal_reg() const { return Op_RegL; }
};
+template <typename TypeClass>
+Node* make_and(Node* a, Node* b);
+
+template <>
+inline Node* make_and<TypeLong>(Node* a, Node* b) {
+ return new AndLNode(a, b);
+}
+
+template <>
+inline Node* make_and<TypeInt>(Node* a, Node* b) {
+ return new AndINode(a, b);
+}
+
class LShiftNode : public Node {
public:
LShiftNode(Node *in1, Node *in2) : Node(nullptr,in1,in2) {
@@ -358,6 +371,19 @@ class URShiftLNode : public Node {
virtual uint ideal_reg() const { return Op_RegL; }
};
+template <typename TypeClass>
+Node* make_urshift(Node* a, Node* b);
+
+template <>
+inline Node* make_urshift<TypeLong>(Node* a, Node* b) {
+ return new URShiftLNode(a, b);
+}
+
+template <>
+inline Node* make_urshift<TypeInt>(Node* a, Node* b) {
+ return new URShiftINode(a, b);
+}
+
//------------------------------FmaNode--------------------------------------
// fused-multiply-add
class FmaNode : public Node {
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 68910ae315f..fc32a0146b3 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1140,7 +1140,6 @@ class Node {
// Check if 'this' node dominates or equal to 'sub'.
DomResult dominates(Node* sub, Node_List &nlist);
-protected:
bool remove_dead_region(PhaseGVN *phase, bool can_reshape);
public:
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 498ea95b120..e8d970b132d 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -1419,7 +1419,7 @@ void PhaseOutput::estimate_buffer_size(int& const_req) {
// Calculate the offsets of the constants and the size of the
// constant table (including the padding to the next section).
constant_table().calculate_offsets_and_size();
- const_req = constant_table().size() + add_size;
+ const_req = constant_table().alignment() + constant_table().size() + add_size;
}
// Initialize the space for the BufferBlob used to find and verify
@@ -1459,6 +1459,7 @@ CodeBuffer* PhaseOutput::init_buffer() {
total_req += deopt_handler_req; // deopt MH handler
CodeBuffer* cb = code_buffer();
+ cb->set_const_section_alignment(constant_table().alignment());
cb->initialize(total_req, _buf_sizes._reloc);
// Have we run out of code space?
diff --git a/src/hotspot/share/opto/parse3.cpp b/src/hotspot/share/opto/parse3.cpp
index 5c7efbfea3c..40f4a4295a9 100644
--- a/src/hotspot/share/opto/parse3.cpp
+++ b/src/hotspot/share/opto/parse3.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/phase.cpp b/src/hotspot/share/opto/phase.cpp
index 8ab98f8a3f3..3684918cea5 100644
--- a/src/hotspot/share/opto/phase.cpp
+++ b/src/hotspot/share/opto/phase.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/phase.hpp b/src/hotspot/share/opto/phase.hpp
index 5d86618fc32..ff166c8de8e 100644
--- a/src/hotspot/share/opto/phase.hpp
+++ b/src/hotspot/share/opto/phase.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 9566b295b7f..7629b60dd6c 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1781,7 +1781,9 @@ void PhaseIterGVN::remove_speculative_types() {
bool PhaseIterGVN::no_dependent_zero_check(Node* n) const {
switch (n->Opcode()) {
case Op_DivI:
- case Op_ModI: {
+ case Op_ModI:
+ case Op_UDivI:
+ case Op_UModI: {
// Type of divisor includes 0?
if (type(n->in(2)) == Type::TOP) {
// 'n' is dead. Treat as if zero check is still there to avoid any further optimizations.
@@ -1791,7 +1793,9 @@ bool PhaseIterGVN::no_dependent_zero_check(Node* n) const {
return (type_divisor->_hi < 0 || type_divisor->_lo > 0);
}
case Op_DivL:
- case Op_ModL: {
+ case Op_ModL:
+ case Op_UDivL:
+ case Op_UModL: {
// Type of divisor includes 0?
if (type(n->in(2)) == Type::TOP) {
// 'n' is dead. Treat as if zero check is still there to avoid any further optimizations.
diff --git a/src/hotspot/share/opto/postaloc.cpp b/src/hotspot/share/opto/postaloc.cpp
index 2c1d0098b78..c22d23bc1fc 100644
--- a/src/hotspot/share/opto/postaloc.cpp
+++ b/src/hotspot/share/opto/postaloc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 3df899f5e9a..1a023d04b68 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -274,8 +274,7 @@ bool InitializedAssertionPredicate::is_predicate(Node* node) {
}
void InitializedAssertionPredicate::kill(PhaseIdealLoop* phase) const {
- Node* true_con = phase->igvn().intcon(1);
- phase->set_ctrl(true_con, phase->C->root());
+ Node* true_con = phase->intcon(1);
phase->igvn().replace_input_of(_if_node, 1, true_con);
}
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index 407a931a91c..ef27c093290 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/replacednodes.cpp b/src/hotspot/share/opto/replacednodes.cpp
index 31c4c55c93a..fe98bbc5cbb 100644
--- a/src/hotspot/share/opto/replacednodes.cpp
+++ b/src/hotspot/share/opto/replacednodes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp
index 2069df33e89..a6216a0dba3 100644
--- a/src/hotspot/share/opto/split_if.cpp
+++ b/src/hotspot/share/opto/split_if.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
index 9be349ed237..4385e334d93 100644
--- a/src/hotspot/share/opto/stringopts.cpp
+++ b/src/hotspot/share/opto/stringopts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/opto/type.hpp b/src/hotspot/share/opto/type.hpp
index a70cd90b471..d58f8cde203 100644
--- a/src/hotspot/share/opto/type.hpp
+++ b/src/hotspot/share/opto/type.hpp
@@ -340,6 +340,9 @@ class Type {
const TypeAryPtr *isa_aryptr() const; // Returns null if not AryPtr
const TypeAryPtr *is_aryptr() const; // Array oop
+ template <typename TypeClass>
+ const TypeClass* cast() const;
+
const TypeMetadataPtr *isa_metadataptr() const; // Returns null if not oop ptr type
const TypeMetadataPtr *is_metadataptr() const; // Java-style GC'd pointer
const TypeKlassPtr *isa_klassptr() const; // Returns null if not KlassPtr
@@ -2317,6 +2320,15 @@ inline ciInlineKlass* Type::inline_klass() const {
return make_ptr()->is_instptr()->instance_klass()->as_inline_klass();
}
+template <>
+inline const TypeInt* Type::cast<TypeInt>() const {
+ return is_int();
+}
+
+template <>
+inline const TypeLong* Type::cast<TypeLong>() const {
+ return is_long();
+}
// ===============================================================
// Things that need to be 64-bits in the 64-bit build but
diff --git a/src/hotspot/share/opto/vector.cpp b/src/hotspot/share/opto/vector.cpp
index 24b2d5fb301..673612914ae 100644
--- a/src/hotspot/share/opto/vector.cpp
+++ b/src/hotspot/share/opto/vector.cpp
@@ -36,11 +36,6 @@ static bool is_vector_mask(ciKlass* klass) {
return klass->is_subclass_of(ciEnv::current()->vector_VectorMask_klass());
}
-static bool is_vector_shuffle(ciKlass* klass) {
- return klass->is_subclass_of(ciEnv::current()->vector_VectorShuffle_klass());
-}
-
-
void PhaseVector::optimize_vector_boxes() {
Compile::TracePhase tp(_t_vector_elimination);
@@ -460,8 +455,6 @@ void PhaseVector::expand_vunbox_node(VectorUnboxNode* vec_unbox) {
if (is_vector_mask(from_kls)) {
bt = T_BOOLEAN;
- } else if (is_vector_shuffle(from_kls)) {
- bt = T_BYTE;
}
ciField* field = ciEnv::current()->vector_VectorPayload_klass()->get_field_by_name(ciSymbols::payload_name(),
@@ -506,9 +499,6 @@ void PhaseVector::expand_vunbox_node(VectorUnboxNode* vec_unbox) {
if (is_vector_mask(from_kls)) {
vec_val_load = gvn.transform(new VectorLoadMaskNode(vec_val_load, TypeVect::makemask(masktype, num_elem)));
- } else if (is_vector_shuffle(from_kls) && !vec_unbox->is_shuffle_to_vector()) {
- assert(vec_unbox->bottom_type()->is_vect()->element_basic_type() == masktype, "expect shuffle type consistency");
- vec_val_load = gvn.transform(new VectorLoadShuffleNode(vec_val_load, TypeVect::make(masktype, num_elem)));
}
gvn.hash_delete(vec_unbox);
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 3d20b22a175..ce37e5604fa 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -74,10 +74,6 @@ static bool is_vector_mask(ciKlass* klass) {
return klass->is_subclass_of(ciEnv::current()->vector_VectorMask_klass());
}
-static bool is_vector_shuffle(ciKlass* klass) {
- return klass->is_subclass_of(ciEnv::current()->vector_VectorShuffle_klass());
-}
-
bool LibraryCallKit::arch_supports_vector_rotate(int opc, int num_elem, BasicType elem_bt,
VectorMaskUseType mask_use_type, bool has_scalar_args) {
bool is_supported = true;
@@ -162,7 +158,7 @@ Node* GraphKit::box_vector(Node* vector, const TypeInstPtr* vbox_type, BasicType
return gvn().transform(vbox);
}
-Node* GraphKit::unbox_vector(Node* v, const TypeInstPtr* vbox_type, BasicType elem_bt, int num_elem, bool shuffle_to_vector) {
+Node* GraphKit::unbox_vector(Node* v, const TypeInstPtr* vbox_type, BasicType elem_bt, int num_elem) {
assert(EnableVectorSupport, "");
const TypeInstPtr* vbox_type_v = gvn().type(v)->isa_instptr();
if (vbox_type_v == nullptr || vbox_type->instance_klass() != vbox_type_v->instance_klass()) {
@@ -173,7 +169,7 @@ Node* GraphKit::unbox_vector(Node* v, const TypeInstPtr* vbox_type, BasicType el
}
assert(check_vbox(vbox_type), "");
const TypeVect* vt = TypeVect::make(elem_bt, num_elem, is_vector_mask(vbox_type->instance_klass()));
- Node* unbox = gvn().transform(new VectorUnboxNode(C, vt, v, merged_memory(), shuffle_to_vector));
+ Node* unbox = gvn().transform(new VectorUnboxNode(C, vt, v, merged_memory()));
return unbox;
}
@@ -514,135 +510,7 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
return true;
}
-// Following routine generates IR corresponding to AbstractShuffle::partiallyWrapIndex method,
-// which partially wraps index by modulo VEC_LENGTH and generates a negative index value if original
-// index is out of valid index range [0, VEC_LENGTH)
-//
-// wrapped_index = (VEC_LENGTH - 1) & index
-// if (index u> VEC_LENGTH) {
-// wrapped_index -= VEC_LENGTH;
-//
-// Note: Unsigned greater than comparison treat both <0 and >VEC_LENGTH indices as out-of-bound
-// indexes.
-Node* LibraryCallKit::partially_wrap_indexes(Node* index_vec, int num_elem, BasicType elem_bt) {
- assert(elem_bt == T_BYTE, "Shuffles use byte array based backing storage.");
- const TypeVect* vt = TypeVect::make(elem_bt, num_elem);
-
- Node* mod_mask = gvn().makecon(TypeInt::make(num_elem-1));
- Node* bcast_mod_mask = gvn().transform(VectorNode::scalar2vector(mod_mask, num_elem, elem_bt));
-
- BoolTest::mask pred = BoolTest::ugt;
- ConINode* pred_node = (ConINode*)gvn().makecon(TypeInt::make(pred));
- Node* lane_cnt = gvn().makecon(TypeInt::make(num_elem));
- Node* bcast_lane_cnt = gvn().transform(VectorNode::scalar2vector(lane_cnt, num_elem, elem_bt));
- const TypeVect* vmask_type = TypeVect::makemask(elem_bt, num_elem);
- Node* mask = gvn().transform(new VectorMaskCmpNode(pred, bcast_lane_cnt, index_vec, pred_node, vmask_type));
-
- // Make the indices greater than lane count as -ve values to match the java side implementation.
- index_vec = gvn().transform(VectorNode::make(Op_AndV, index_vec, bcast_mod_mask, vt));
- Node* biased_val = gvn().transform(VectorNode::make(Op_SubVB, index_vec, bcast_lane_cnt, vt));
- return gvn().transform(new VectorBlendNode(biased_val, index_vec, mask));
-}
-
-// <Sh extends VectorShuffle<E>, E>
-// Sh ShuffleIota(Class<?> E, Class<?> shuffleClass, Vector.Species<E> s, int length,
-// int start, int step, int wrap, ShuffleIotaOperation<Sh, E> defaultImpl)
-bool LibraryCallKit::inline_vector_shuffle_iota() {
- const TypeInstPtr* shuffle_klass = gvn().type(argument(1))->isa_instptr();
- const TypeInt* vlen = gvn().type(argument(3))->isa_int();
- const TypeInt* start_val = gvn().type(argument(4))->isa_int();
- const TypeInt* step_val = gvn().type(argument(5))->isa_int();
- const TypeInt* wrap = gvn().type(argument(6))->isa_int();
-
- if (shuffle_klass == nullptr || shuffle_klass->const_oop() == nullptr ||
- vlen == nullptr || !vlen->is_con() || start_val == nullptr || step_val == nullptr ||
- wrap == nullptr || !wrap->is_con()) {
- return false; // not enough info for intrinsification
- }
-
- if (!is_klass_initialized(shuffle_klass)) {
- log_if_needed(" ** klass argument not initialized");
- return false;
- }
-
- int do_wrap = wrap->get_con();
- int num_elem = vlen->get_con();
- BasicType elem_bt = T_BYTE;
-
- bool effective_indices_in_range = false;
- if (start_val->is_con() && step_val->is_con()) {
- int effective_min_index = start_val->get_con();
- int effective_max_index = start_val->get_con() + step_val->get_con() * (num_elem - 1);
- effective_indices_in_range = effective_max_index >= effective_min_index && effective_min_index >= -128 && effective_max_index <= 127;
- }
-
- if (!do_wrap && !effective_indices_in_range) {
- // Disable instrinsification for unwrapped shuffle iota if start/step
- // values are non-constant OR if intermediate result overflows byte value range.
- return false;
- }
-
- if (!arch_supports_vector(Op_AddVB, num_elem, elem_bt, VecMaskNotUsed) ||
- !arch_supports_vector(Op_AndV, num_elem, elem_bt, VecMaskNotUsed) ||
- !arch_supports_vector(Op_VectorLoadConst, num_elem, elem_bt, VecMaskNotUsed) ||
- !arch_supports_vector(Op_Replicate, num_elem, elem_bt, VecMaskNotUsed)) {
- return false;
- }
-
- if (!do_wrap &&
- (!arch_supports_vector(Op_SubVB, num_elem, elem_bt, VecMaskNotUsed) ||
- !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskNotUsed) ||
- !arch_supports_vector(Op_VectorMaskCmp, num_elem, elem_bt, VecMaskNotUsed))) {
- return false;
- }
-
- bool step_multiply = !step_val->is_con() || !is_power_of_2(step_val->get_con());
- if ((step_multiply && !arch_supports_vector(Op_MulVB, num_elem, elem_bt, VecMaskNotUsed)) ||
- (!step_multiply && !arch_supports_vector(Op_LShiftVB, num_elem, elem_bt, VecMaskNotUsed))) {
- return false;
- }
-
- const TypeVect* vt = TypeVect::make(elem_bt, num_elem);
-
- Node* res = gvn().transform(new VectorLoadConstNode(gvn().makecon(TypeInt::ZERO), vt));
-
- Node* start = argument(4);
- Node* step = argument(5);
-
- if (step_multiply) {
- Node* bcast_step = gvn().transform(VectorNode::scalar2vector(step, num_elem, elem_bt));
- res = gvn().transform(VectorNode::make(Op_MulVB, res, bcast_step, vt));
- } else if (step_val->get_con() > 1) {
- Node* cnt = gvn().makecon(TypeInt::make(log2i_exact(step_val->get_con())));
- Node* shift_cnt = vector_shift_count(cnt, Op_LShiftI, elem_bt, num_elem);
- res = gvn().transform(VectorNode::make(Op_LShiftVB, res, shift_cnt, vt));
- }
-
- if (!start_val->is_con() || start_val->get_con() != 0) {
- Node* bcast_start = gvn().transform(VectorNode::scalar2vector(start, num_elem, elem_bt));
- res = gvn().transform(VectorNode::make(Op_AddVB, res, bcast_start, vt));
- }
-
- Node* mod_val = gvn().makecon(TypeInt::make(num_elem-1));
- Node* bcast_mod = gvn().transform(VectorNode::scalar2vector(mod_val, num_elem, elem_bt));
-
- if (do_wrap) {
- // Wrap the indices greater than lane count.
- res = gvn().transform(VectorNode::make(Op_AndV, res, bcast_mod, vt));
- } else {
- res = partially_wrap_indexes(res, num_elem, elem_bt);
- }
-
- ciKlass* sbox_klass = shuffle_klass->const_oop()->as_instance()->java_lang_Class_klass();
- const TypeInstPtr* shuffle_box_type = TypeInstPtr::make_exact(TypePtr::NotNull, sbox_klass);
-
- // Wrap it up in VectorBox to keep object type information.
- res = box_vector(res, shuffle_box_type, elem_bt, num_elem);
- set_result(res);
- C->set_max_vector_size(MAX2(C->max_vector_size(), (uint)(num_elem * type2aelembytes(elem_bt))));
- return true;
-}
-
+// public static
// <E, M>
// long maskReductionCoerced(int oper, Class<? extends M> maskClass, Class<?> elemClass,
// int length, M m, VectorMaskOp<M> defaultImpl)
@@ -673,10 +541,9 @@ bool LibraryCallKit::inline_vector_mask_operation() {
return false; // not supported
}
- const Type* elem_ty = Type::get_const_basic_type(elem_bt);
ciKlass* mbox_klass = mask_klass->const_oop()->as_instance()->java_lang_Class_klass();
const TypeInstPtr* mask_box_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
- Node* mask_vec = unbox_vector(mask, mask_box_type, elem_bt, num_elem, true);
+ Node* mask_vec = unbox_vector(mask, mask_box_type, elem_bt, num_elem);
if (mask_vec == nullptr) {
log_if_needed(" ** unbox failed mask=%s",
NodeClassNames[argument(4)->Opcode()]);
@@ -697,124 +564,6 @@ bool LibraryCallKit::inline_vector_mask_operation() {
return true;
}
-// public static
-// <V,
-// Sh extends VectorShuffle<E>,
-// E>
-// V shuffleToVector(Class<? extends Vector<E>> vclass, Class<E> elementType,
-// Class<? extends Sh> shuffleClass, Sh s, int length,
-// ShuffleToVectorOperation<V, Sh, E> defaultImpl)
-bool LibraryCallKit::inline_vector_shuffle_to_vector() {
- const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
- const TypeInstPtr* elem_klass = gvn().type(argument(1))->isa_instptr();
- const TypeInstPtr* shuffle_klass = gvn().type(argument(2))->isa_instptr();
- Node* shuffle = argument(3);
- const TypeInt* vlen = gvn().type(argument(4))->isa_int();
-
- if (vector_klass == nullptr || elem_klass == nullptr || shuffle_klass == nullptr || shuffle->is_top() || vlen == nullptr) {
- return false; // dead code
- }
- if (!vlen->is_con() || vector_klass->const_oop() == nullptr || shuffle_klass->const_oop() == nullptr) {
- return false; // not enough info for intrinsification
- }
- if (!is_klass_initialized(shuffle_klass) || !is_klass_initialized(vector_klass) ) {
- log_if_needed(" ** klass argument not initialized");
- return false;
- }
-
- int num_elem = vlen->get_con();
- ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
- BasicType elem_bt = elem_type->basic_type();
-
- if (num_elem < 4) {
- return false;
- }
-
- int cast_vopc = VectorCastNode::opcode(-1, T_BYTE); // from shuffle of type T_BYTE
- // Make sure that cast is implemented to particular type/size combination.
- if (!arch_supports_vector(cast_vopc, num_elem, elem_bt, VecMaskNotUsed)) {
- log_if_needed(" ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
- cast_vopc, num_elem, type2name(elem_bt));
- return false;
- }
-
- ciKlass* sbox_klass = shuffle_klass->const_oop()->as_instance()->java_lang_Class_klass();
- const TypeInstPtr* shuffle_box_type = TypeInstPtr::make_exact(TypePtr::NotNull, sbox_klass);
-
- // Unbox shuffle with true flag to indicate its load shuffle to vector
- // shuffle is a byte array
- Node* shuffle_vec = unbox_vector(shuffle, shuffle_box_type, T_BYTE, num_elem, true);
-
- // cast byte to target element type
- shuffle_vec = gvn().transform(VectorCastNode::make(cast_vopc, shuffle_vec, elem_bt, num_elem));
-
- ciKlass* vbox_klass = vector_klass->const_oop()->as_instance()->java_lang_Class_klass();
- const TypeInstPtr* vec_box_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
-
- // Box vector
- Node* res = box_vector(shuffle_vec, vec_box_type, elem_bt, num_elem);
- set_result(res);
- C->set_max_vector_size(MAX2(C->max_vector_size(), (uint)(num_elem * type2aelembytes(elem_bt))));
- return true;
-}
-
-// public static
-// <E,
-// SH extends VectorShuffle<E>>
-// SH wrapShuffleIndexes(Class<E> eClass, Class<? extends SH> shClass, SH sh, int length,
-// ShuffleWrapIndexesOperation<SH> defaultImpl)
-bool LibraryCallKit::inline_vector_wrap_shuffle_indexes() {
- const TypeInstPtr* elem_klass = gvn().type(argument(0))->isa_instptr();
- const TypeInstPtr* shuffle_klass = gvn().type(argument(1))->isa_instptr();
- Node* shuffle = argument(2);
- const TypeInt* vlen = gvn().type(argument(3))->isa_int();
-
- if (elem_klass == nullptr || shuffle_klass == nullptr || shuffle->is_top() || vlen == nullptr ||
- !vlen->is_con() || shuffle_klass->const_oop() == nullptr) {
- // not enough info for intrinsification
- return false;
- }
-
- if (!is_klass_initialized(shuffle_klass)) {
- log_if_needed(" ** klass argument not initialized");
- return false;
- }
-
- int num_elem = vlen->get_con();
- if ((num_elem < 4) || !is_power_of_2(num_elem)) {
- log_if_needed(" ** vlen < 4 or not power of two=%d", num_elem);
- return false;
- }
-
- // Shuffles use byte array based backing storage
- BasicType shuffle_bt = T_BYTE;
- if (!arch_supports_vector(Op_AndV, num_elem, shuffle_bt, VecMaskNotUsed) ||
- !arch_supports_vector(Op_Replicate, num_elem, shuffle_bt, VecMaskNotUsed)) {
- log_if_needed(" ** not supported: op=wrapShuffleIndexes vlen=%d etype=%s",
- num_elem, type2name(shuffle_bt));
- return false;
- }
-
- ciKlass* sbox_klass = shuffle_klass->const_oop()->as_instance()->java_lang_Class_klass();
- const TypeInstPtr* shuffle_box_type = TypeInstPtr::make_exact(TypePtr::NotNull, sbox_klass);
-
- // Unbox shuffle with true flag to indicate its load shuffle to vector
- // shuffle is a byte array
- Node* shuffle_vec = unbox_vector(shuffle, shuffle_box_type, shuffle_bt, num_elem, true);
-
- const TypeVect* vt = TypeVect::make(shuffle_bt, num_elem);
- Node* mod_mask = gvn().makecon(TypeInt::make(num_elem - 1));
- Node* bcast_mod_mask = gvn().transform(VectorNode::scalar2vector(mod_mask, num_elem, shuffle_bt));
- // Wrap the indices greater than lane count.
- Node* res = gvn().transform(VectorNode::make(Op_AndV, shuffle_vec, bcast_mod_mask, vt));
-
- // Wrap it up in VectorBox to keep object type information.
- res = box_vector(res, shuffle_box_type, shuffle_bt, num_elem);
- set_result(res);
- C->set_max_vector_size(MAX2(C->max_vector_size(), (uint)(num_elem * type2aelembytes(shuffle_bt))));
- return true;
-}
-
// public static
// <M,
// S extends VectorSpecies<E>,
@@ -1995,13 +1744,23 @@ bool LibraryCallKit::inline_vector_rearrange() {
log_if_needed(" ** not a primitive bt=%d", elem_type->basic_type());
return false; // should be primitive type
}
+
BasicType elem_bt = elem_type->basic_type();
BasicType shuffle_bt = elem_bt;
+ if (shuffle_bt == T_FLOAT) {
+ shuffle_bt = T_INT;
+ } else if (shuffle_bt == T_DOUBLE) {
+ shuffle_bt = T_LONG;
+ }
+
int num_elem = vlen->get_con();
+ bool need_load_shuffle = Matcher::vector_rearrange_requires_load_shuffle(shuffle_bt, num_elem);
- if (!arch_supports_vector(Op_VectorLoadShuffle, num_elem, elem_bt, VecMaskNotUsed)) {
- log_if_needed(" ** not supported: arity=0 op=load/shuffle vlen=%d etype=%s ismask=no",
- num_elem, type2name(elem_bt));
+ if (need_load_shuffle && !arch_supports_vector(Op_VectorLoadShuffle, num_elem, shuffle_bt, VecMaskNotUsed)) {
+ if (C->print_intrinsics()) {
+ tty->print_cr(" ** not supported: arity=0 op=load/shuffle vlen=%d etype=%s ismask=no",
+ num_elem, type2name(shuffle_bt));
+ }
return false; // not supported
}
@@ -2013,6 +1772,11 @@ bool LibraryCallKit::inline_vector_rearrange() {
!is_klass_initialized(mask_klass))) {
log_if_needed(" ** mask_klass argument not initialized");
}
+ if (!arch_supports_vector(Op_AndV, num_elem, elem_bt, VecMaskNotUsed)) {
+ log_if_needed(" ** not supported: arity=2 op=and vlen=%d etype=%s ismask=no",
+ num_elem, type2name(elem_bt));
+ return false;
+ }
VectorMaskUseType checkFlags = (VectorMaskUseType)(is_masked_op ? (VecMaskUseLoad | VecMaskUsePred) : VecMaskNotUsed);
if (!arch_supports_vector(Op_VectorRearrange, num_elem, elem_bt, checkFlags)) {
use_predicate = false;
@@ -2033,11 +1797,17 @@ bool LibraryCallKit::inline_vector_rearrange() {
Node* v1 = unbox_vector(argument(5), vbox_type, elem_bt, num_elem);
Node* shuffle = unbox_vector(argument(6), shbox_type, shuffle_bt, num_elem);
+ const TypeVect* st = TypeVect::make(shuffle_bt, num_elem);
if (v1 == nullptr || shuffle == nullptr) {
return false; // operand unboxing failed
}
+ assert(is_power_of_2(num_elem), "wrapping invalid");
+ Node* wrapping_mask_elem = gvn().makecon(TypeInteger::make(num_elem - 1, num_elem - 1, Type::WidenMin, shuffle_bt == T_LONG ? T_LONG : T_INT));
+ Node* wrapping_mask = gvn().transform(VectorNode::scalar2vector(wrapping_mask_elem, num_elem, shuffle_bt));
+ shuffle = gvn().transform(new AndVNode(shuffle, wrapping_mask, st));
+
Node* mask = nullptr;
if (is_masked_op) {
ciKlass* mbox_klass = mask_klass->const_oop()->as_instance()->java_lang_Class_klass();
@@ -2050,13 +1820,16 @@ bool LibraryCallKit::inline_vector_rearrange() {
}
}
+ if (need_load_shuffle) {
+ shuffle = gvn().transform(new VectorLoadShuffleNode(shuffle, st));
+ }
+
Node* rearrange = new VectorRearrangeNode(v1, shuffle);
if (is_masked_op) {
if (use_predicate) {
rearrange->add_req(mask);
rearrange->add_flag(Node::Flag_is_predicated_vector);
} else {
- const TypeVect* vt = v1->bottom_type()->is_vect();
rearrange = gvn().transform(rearrange);
Node* zero = gvn().makecon(Type::get_zero_type(elem_bt));
Node* zerovec = gvn().transform(VectorNode::scalar2vector(zero, num_elem, elem_bt));
@@ -2154,11 +1927,19 @@ bool LibraryCallKit::inline_vector_select_from() {
return false;
}
+ BasicType shuffle_bt = elem_bt;
+ if (shuffle_bt == T_FLOAT) {
+ shuffle_bt = T_INT;
+ } else if (shuffle_bt == T_DOUBLE) {
+ shuffle_bt = T_LONG;
+ }
+ bool need_load_shuffle = Matcher::vector_rearrange_requires_load_shuffle(shuffle_bt, num_elem);
+
int cast_vopc = VectorCastNode::opcode(-1, elem_bt); // from vector of type elem_bt
- if (!arch_supports_vector(Op_VectorLoadShuffle, num_elem, elem_bt, VecMaskNotUsed)||
- !arch_supports_vector(Op_AndV, num_elem, T_BYTE, VecMaskNotUsed) ||
- !arch_supports_vector(Op_Replicate, num_elem, T_BYTE, VecMaskNotUsed) ||
- !arch_supports_vector(cast_vopc, num_elem, T_BYTE, VecMaskNotUsed)) {
+ if ((need_load_shuffle && !arch_supports_vector(Op_VectorLoadShuffle, num_elem, elem_bt, VecMaskNotUsed)) ||
+ (elem_bt != shuffle_bt && !arch_supports_vector(cast_vopc, num_elem, shuffle_bt, VecMaskNotUsed)) ||
+ !arch_supports_vector(Op_AndV, num_elem, shuffle_bt, VecMaskNotUsed) ||
+ !arch_supports_vector(Op_Replicate, num_elem, shuffle_bt, VecMaskNotUsed)) {
log_if_needed(" ** not supported: arity=0 op=selectFrom vlen=%d etype=%s ismask=no",
num_elem, type2name(elem_bt));
return false; // not supported
@@ -2215,21 +1996,26 @@ bool LibraryCallKit::inline_vector_select_from() {
}
// cast index vector from elem_bt vector to byte vector
- const TypeVect* byte_vt = TypeVect::make(T_BYTE, num_elem);
- Node* byte_shuffle = gvn().transform(VectorCastNode::make(cast_vopc, v1, T_BYTE, num_elem));
+ const TypeVect* shuffle_vt = TypeVect::make(shuffle_bt, num_elem);
+ Node* shuffle = v1;
+
+ if (shuffle_bt != elem_bt) {
+ shuffle = gvn().transform(VectorCastNode::make(cast_vopc, v1, shuffle_bt, num_elem));
+ }
// wrap the byte vector lanes to (num_elem - 1) to form the shuffle vector where num_elem is vector length
// this is a simple AND operation as we come here only for power of two vector length
- Node* mod_val = gvn().makecon(TypeInt::make(num_elem-1));
- Node* bcast_mod = gvn().transform(VectorNode::scalar2vector(mod_val, num_elem, T_BYTE));
- byte_shuffle = gvn().transform(VectorNode::make(Op_AndV, byte_shuffle, bcast_mod, byte_vt));
+ Node* mod_val = gvn().makecon(TypeInteger::make(num_elem - 1, num_elem - 1, Type::WidenMin, shuffle_bt == T_LONG ? T_LONG : T_INT));
+ Node* bcast_mod = gvn().transform(VectorNode::scalar2vector(mod_val, num_elem, shuffle_bt));
+ shuffle = gvn().transform(VectorNode::make(Op_AndV, shuffle, bcast_mod, shuffle_vt));
// load the shuffle to use in rearrange
- const TypeVect* shuffle_vt = TypeVect::make(elem_bt, num_elem);
- Node* load_shuffle = gvn().transform(new VectorLoadShuffleNode(byte_shuffle, shuffle_vt));
+ if (need_load_shuffle) {
+ shuffle = gvn().transform(new VectorLoadShuffleNode(shuffle, shuffle_vt));
+ }
// and finally rearrange
- Node* rearrange = new VectorRearrangeNode(v2, load_shuffle);
+ Node* rearrange = new VectorRearrangeNode(v2, shuffle);
if (is_masked_op) {
if (use_predicate) {
// masked rearrange is supported so use that directly
@@ -2482,9 +2268,7 @@ bool LibraryCallKit::inline_vector_convert() {
ciKlass* vbox_klass_from = vector_klass_from->const_oop()->as_instance()->java_lang_Class_klass();
ciKlass* vbox_klass_to = vector_klass_to->const_oop()->as_instance()->java_lang_Class_klass();
- if (is_vector_shuffle(vbox_klass_from)) {
- return false; // vector shuffles aren't supported
- }
+
bool is_mask = is_vector_mask(vbox_klass_from);
ciType* elem_type_from = elem_klass_from->const_oop()->as_instance()->java_mirror_type();
@@ -2524,18 +2308,6 @@ bool LibraryCallKit::inline_vector_convert() {
return false;
}
-
- if (is_vector_shuffle(vbox_klass_to) &&
- (!arch_supports_vector(Op_SubVB, num_elem_to, elem_bt_to, VecMaskNotUsed) ||
- !arch_supports_vector(Op_VectorBlend, num_elem_to, elem_bt_to, VecMaskNotUsed) ||
- !arch_supports_vector(Op_VectorMaskCmp, num_elem_to, elem_bt_to, VecMaskNotUsed) ||
- !arch_supports_vector(Op_AndV, num_elem_to, elem_bt_to, VecMaskNotUsed) ||
- !arch_supports_vector(Op_Replicate, num_elem_to, elem_bt_to, VecMaskNotUsed))) {
- log_if_needed(" ** not supported: arity=1 op=shuffle_index_wrap vlen2=%d etype2=%s",
- num_elem_to, type2name(elem_bt_to));
- return false;
- }
-
// At this point, we know that both input and output vector registers are supported
// by the architecture. Next check if the casted type is simply to same type - which means
// that it is actually a resize and not a cast.
@@ -2633,10 +2405,6 @@ bool LibraryCallKit::inline_vector_convert() {
op = gvn().transform(new VectorReinterpretNode(op, src_type, dst_type));
}
- if (is_vector_shuffle(vbox_klass_to)) {
- op = partially_wrap_indexes(op, num_elem_to, elem_bt_to);
- }
-
const TypeInstPtr* vbox_type_to = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass_to);
Node* vbox = box_vector(op, vbox_type_to, elem_bt_to, num_elem_to);
set_result(vbox);
@@ -2864,45 +2632,49 @@ static Node* LowerSelectFromTwoVectorOperation(PhaseGVN& phase, Node* index_vec,
// boxing penalties.
//
- const TypeVect* index_vect_type = index_vec->bottom_type()->is_vect();
- BasicType index_elem_bt = index_vect_type->element_basic_type();
+ BasicType shuffle_bt = elem_bt;
+ if (shuffle_bt == T_FLOAT) {
+ shuffle_bt = T_INT;
+ } else if (shuffle_bt == T_DOUBLE) {
+ shuffle_bt = T_LONG;
+ }
+ const TypeVect* st = TypeVect::make(shuffle_bt, num_elem);
- // Downcast index vector to a type agnostic shuffle representation, shuffle
- // indices are held in a byte vector which are later transformed to target
- // specific permutation index format by subsequent VectorLoadShuffle.
- int cast_vopc = VectorCastNode::opcode(0, index_elem_bt, true);
- Node* index_byte_vec = phase.transform(VectorCastNode::make(cast_vopc, index_vec, T_BYTE, num_elem));
+ // Cast index vector to the corresponding bit type
+ if (elem_bt != shuffle_bt) {
+ int cast_vopc = VectorCastNode::opcode(0, elem_bt, true);
+ index_vec = phase.transform(VectorCastNode::make(cast_vopc, index_vec, shuffle_bt, num_elem));
+ }
// Wrap indexes into two vector index range [0, VLEN * 2)
- Node* two_vect_lane_cnt_m1 = phase.makecon(TypeInt::make(2 * num_elem - 1));
+ Node* two_vect_lane_cnt_m1 = phase.makecon(TypeInteger::make(2 * num_elem - 1, 2 * num_elem - 1, Type::WidenMin, shuffle_bt == T_LONG ? T_LONG : T_INT));
Node* bcast_two_vect_lane_cnt_m1_vec = phase.transform(VectorNode::scalar2vector(two_vect_lane_cnt_m1, num_elem,
- T_BYTE, false));
- index_byte_vec = phase.transform(VectorNode::make(Op_AndV, index_byte_vec, bcast_two_vect_lane_cnt_m1_vec,
- index_byte_vec->bottom_type()->is_vect()));
+ shuffle_bt, false));
+ index_vec = phase.transform(VectorNode::make(Op_AndV, index_vec, bcast_two_vect_lane_cnt_m1_vec, st));
// Compute the blend mask for merging two independently permitted vectors
// using shuffle index in two vector index range [0, VLEN * 2).
BoolTest::mask pred = BoolTest::le;
ConINode* pred_node = phase.makecon(TypeInt::make(pred))->as_ConI();
- const TypeVect* vmask_type = TypeVect::makemask(T_BYTE, num_elem);
- Node* lane_cnt_m1 = phase.makecon(TypeInt::make(num_elem - 1));
- Node* bcast_lane_cnt_m1_vec = phase.transform(VectorNode::scalar2vector(lane_cnt_m1, num_elem,
- T_BYTE, false));
- Node* mask = phase.transform(new VectorMaskCmpNode(pred, index_byte_vec, bcast_lane_cnt_m1_vec, pred_node, vmask_type));
+ const TypeVect* vmask_type = TypeVect::makemask(shuffle_bt, num_elem);
+ Node* lane_cnt_m1 = phase.makecon(TypeInteger::make(num_elem - 1, num_elem - 1, Type::WidenMin, shuffle_bt == T_LONG ? T_LONG : T_INT));
+ Node* bcast_lane_cnt_m1_vec = phase.transform(VectorNode::scalar2vector(lane_cnt_m1, num_elem, shuffle_bt, false));
+ Node* mask = phase.transform(new VectorMaskCmpNode(pred, index_vec, bcast_lane_cnt_m1_vec, pred_node, vmask_type));
// Rearrange expects the indexes to lie within single vector index range [0, VLEN).
- index_byte_vec = phase.transform(VectorNode::make(Op_AndV, index_byte_vec, bcast_lane_cnt_m1_vec,
- index_byte_vec->bottom_type()->is_vect()));
+ Node* wrapped_index_vec = phase.transform(VectorNode::make(Op_AndV, index_vec, bcast_lane_cnt_m1_vec, st));
// Load indexes from byte vector and appropriately transform them to target
// specific permutation index format.
- index_vec = phase.transform(new VectorLoadShuffleNode(index_byte_vec, index_vect_type));
+ if (Matcher::vector_rearrange_requires_load_shuffle(shuffle_bt, num_elem)) {
+ wrapped_index_vec = phase.transform(new VectorLoadShuffleNode(wrapped_index_vec, st));
+ }
vmask_type = TypeVect::makemask(elem_bt, num_elem);
mask = phase.transform(new VectorMaskCastNode(mask, vmask_type));
- Node* p1 = phase.transform(new VectorRearrangeNode(src1, index_vec));
- Node* p2 = phase.transform(new VectorRearrangeNode(src2, index_vec));
+ Node* p1 = phase.transform(new VectorRearrangeNode(src1, wrapped_index_vec));
+ Node* p2 = phase.transform(new VectorRearrangeNode(src2, wrapped_index_vec));
return new VectorBlendNode(p2, p1, mask);
}
@@ -2955,14 +2727,14 @@ bool LibraryCallKit::inline_vector_select_from_two_vectors() {
bool lowerSelectFromOp = false;
if (!arch_supports_vector(Op_SelectFromTwoVector, num_elem, elem_bt, VecMaskNotUsed)) {
int cast_vopc = VectorCastNode::opcode(-1, elem_bt, true);
- if (!arch_supports_vector(Op_VectorMaskCmp, num_elem, T_BYTE, VecMaskNotUsed) ||
- !arch_supports_vector(Op_AndV, num_elem, T_BYTE, VecMaskNotUsed) ||
+ if ((elem_bt != index_elem_bt && !arch_supports_vector(cast_vopc, num_elem, index_elem_bt, VecMaskNotUsed)) ||
+ !arch_supports_vector(Op_VectorMaskCmp, num_elem, index_elem_bt, VecMaskNotUsed) ||
+ !arch_supports_vector(Op_AndV, num_elem, index_elem_bt, VecMaskNotUsed) ||
!arch_supports_vector(Op_VectorMaskCast, num_elem, elem_bt, VecMaskNotUsed) ||
!arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad) ||
!arch_supports_vector(Op_VectorRearrange, num_elem, elem_bt, VecMaskNotUsed) ||
- !arch_supports_vector(cast_vopc, num_elem, T_BYTE, VecMaskNotUsed) ||
!arch_supports_vector(Op_VectorLoadShuffle, num_elem, index_elem_bt, VecMaskNotUsed) ||
- !arch_supports_vector(Op_Replicate, num_elem, T_BYTE, VecMaskNotUsed)) {
+ !arch_supports_vector(Op_Replicate, num_elem, index_elem_bt, VecMaskNotUsed)) {
log_if_needed(" ** not supported: opc=%d vlen=%d etype=%s ismask=useload",
Op_SelectFromTwoVector, num_elem, type2name(elem_bt));
return false; // not supported
diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index 4d152189625..e7b0a149cd8 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -1215,9 +1215,7 @@ Node* VPointer::maybe_negate_invar(bool negate, Node* invar) {
if (negate) {
BasicType bt = invar->bottom_type()->basic_type();
assert(bt == T_INT || bt == T_LONG, "");
- PhaseIterGVN& igvn = phase()->igvn();
- Node* zero = igvn.zerocon(bt);
- phase()->set_ctrl(zero, phase()->C->root());
+ Node* zero = phase()->zerocon(bt);
Node* sub = SubNode::make(zero, invar, bt);
invar = register_if_new(sub);
}
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index dedac80d102..33429dfacad 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1466,6 +1466,9 @@ bool VectorCastNode::implemented(int opc, uint vlen, BasicType src_type, BasicTy
if (is_java_primitive(dst_type) &&
is_java_primitive(src_type) &&
(vlen > 1) && is_power_of_2(vlen) &&
+ // In rare case, the input to the VectorCast could be a Replicate node. We need to make sure creating is supported:
+ // check the src_type:
+ VectorNode::vector_size_supported_auto_vectorization(src_type, vlen) &&
VectorNode::vector_size_supported_auto_vectorization(dst_type, vlen)) {
int vopc = VectorCastNode::opcode(opc, src_type);
return vopc > 0 && Matcher::match_rule_supported_auto_vectorization(vopc, vlen, dst_type);
@@ -1728,19 +1731,13 @@ Node* VectorUnboxNode::Ideal(PhaseGVN* phase, bool can_reshape) {
if (in_vt->length() == out_vt->length()) {
Node* value = vbox->in(VectorBoxNode::Value);
- bool is_vector_mask = vbox_klass->is_subclass_of(ciEnv::current()->vector_VectorMask_klass());
- bool is_vector_shuffle = vbox_klass->is_subclass_of(ciEnv::current()->vector_VectorShuffle_klass());
+ bool is_vector_mask = vbox_klass->is_subclass_of(ciEnv::current()->vector_VectorMask_klass());
if (is_vector_mask) {
// VectorUnbox (VectorBox vmask) ==> VectorMaskCast vmask
const TypeVect* vmask_type = TypeVect::makemask(out_vt->element_basic_type(), out_vt->length());
return new VectorMaskCastNode(value, vmask_type);
- } else if (is_vector_shuffle) {
- if (!is_shuffle_to_vector()) {
- // VectorUnbox (VectorBox vshuffle) ==> VectorLoadShuffle vshuffle
- return new VectorLoadShuffleNode(value, out_vt);
- }
} else {
- // Vector type mismatch is only supported for masks and shuffles, but sometimes it happens in pathological cases.
+ // Vector type mismatch is only supported for masks, but sometimes it happens in pathological cases.
}
} else {
// Vector length mismatch.
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index 3f737e6e881..f5574ba79e3 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -1688,15 +1688,18 @@ class SelectFromTwoVectorNode : public VectorNode {
virtual int Opcode() const;
};
-
+// The target may not directly support the rearrange operation for an element type. In those cases,
+// we can transform the rearrange into a different element type. For example, on x86 before AVX512,
+// there is no rearrange instruction for short elements, what we will then do is to transform the
+// shuffle vector into one that we can do byte rearrange such that it would provide the same
+// result. This could have been done in VectorRearrangeNode during code emission but we eagerly
+// expand this out because it is often the case that an index vector is reused in many rearrange
+// operations. This allows the index preparation to be GVN-ed as well as hoisted out of loops, etc.
class VectorLoadShuffleNode : public VectorNode {
public:
VectorLoadShuffleNode(Node* in, const TypeVect* vt)
- : VectorNode(in, vt) {
- assert(in->bottom_type()->is_vect()->element_basic_type() == T_BYTE, "must be BYTE");
- }
+ : VectorNode(in, vt) {}
- int GetOutShuffleSize() const { return type2aelembytes(vect_type()->element_basic_type()); }
virtual int Opcode() const;
};
@@ -1935,14 +1938,11 @@ class VectorBoxAllocateNode : public CallStaticJavaNode {
};
class VectorUnboxNode : public VectorNode {
- private:
- bool _shuffle_to_vector;
protected:
uint size_of() const { return sizeof(*this); }
public:
- VectorUnboxNode(Compile* C, const TypeVect* vec_type, Node* obj, Node* mem, bool shuffle_to_vector)
+ VectorUnboxNode(Compile* C, const TypeVect* vec_type, Node* obj, Node* mem)
: VectorNode(mem, obj, vec_type) {
- _shuffle_to_vector = shuffle_to_vector;
init_class_id(Class_VectorUnbox);
init_flags(Flag_is_macro);
C->add_macro_node(this);
@@ -1953,7 +1953,6 @@ class VectorUnboxNode : public VectorNode {
Node* mem() const { return in(1); }
virtual Node* Identity(PhaseGVN* phase);
Node* Ideal(PhaseGVN* phase, bool can_reshape);
- bool is_shuffle_to_vector() { return _shuffle_to_vector; }
};
class RotateRightVNode : public VectorNode {
diff --git a/src/hotspot/share/prims/foreignGlobals.cpp b/src/hotspot/share/prims/foreignGlobals.cpp
index 11b0b8ace7c..9e74936a431 100644
--- a/src/hotspot/share/prims/foreignGlobals.cpp
+++ b/src/hotspot/share/prims/foreignGlobals.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 5c33dd1dfa4..c94df93e7af 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -3463,7 +3463,7 @@ JVM_LEAF(jboolean, JVM_IsForeignLinkerSupported(void))
return ForeignGlobals::is_foreign_linker_supported() ? JNI_TRUE : JNI_FALSE;
JVM_END
-JVM_ENTRY_NO_ENV(jboolean, JVM_IsStaticallyLinked(void))
+JVM_LEAF(jboolean, JVM_IsStaticallyLinked(void))
return is_vm_statically_linked() ? JNI_TRUE : JNI_FALSE;
JVM_END
diff --git a/src/hotspot/share/prims/jvmtiAgent.hpp b/src/hotspot/share/prims/jvmtiAgent.hpp
index 9baf6698868..fbbb193453f 100644
--- a/src/hotspot/share/prims/jvmtiAgent.hpp
+++ b/src/hotspot/share/prims/jvmtiAgent.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/prims/jvmtiCodeBlobEvents.cpp b/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp
index a32bba9225a..97250a4a5ee 100644
--- a/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp
+++ b/src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/prims/jvmtiEventController.hpp b/src/hotspot/share/prims/jvmtiEventController.hpp
index afe1d700d96..cdd75a2ec56 100644
--- a/src/hotspot/share/prims/jvmtiEventController.hpp
+++ b/src/hotspot/share/prims/jvmtiEventController.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/prims/jvmtiRawMonitor.cpp b/src/hotspot/share/prims/jvmtiRawMonitor.cpp
index 5a536b1a035..1c0df233779 100644
--- a/src/hotspot/share/prims/jvmtiRawMonitor.cpp
+++ b/src/hotspot/share/prims/jvmtiRawMonitor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp
index d175aa6c78d..40cc44bd3f9 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/prims/methodComparator.cpp b/src/hotspot/share/prims/methodComparator.cpp
index ac4b59a6d9a..40d7a4628ec 100644
--- a/src/hotspot/share/prims/methodComparator.cpp
+++ b/src/hotspot/share/prims/methodComparator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/prims/upcallLinker.hpp b/src/hotspot/share/prims/upcallLinker.hpp
index 765ed63fc5a..f3275a22ef0 100644
--- a/src/hotspot/share/prims/upcallLinker.hpp
+++ b/src/hotspot/share/prims/upcallLinker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/prims/vectorSupport.cpp b/src/hotspot/share/prims/vectorSupport.cpp
index 9eb0b46131b..21acaa06348 100644
--- a/src/hotspot/share/prims/vectorSupport.cpp
+++ b/src/hotspot/share/prims/vectorSupport.cpp
@@ -73,10 +73,6 @@ bool VectorSupport::is_vector_mask(Klass* klass) {
return klass->is_subclass_of(vmClasses::vector_VectorMask_klass());
}
-bool VectorSupport::is_vector_shuffle(Klass* klass) {
- return klass->is_subclass_of(vmClasses::vector_VectorShuffle_klass());
-}
-
BasicType VectorSupport::klass2bt(InstanceKlass* ik) {
assert(ik->is_subclass_of(vmClasses::vector_VectorPayload_klass()), "%s not a VectorPayload", ik->name()->as_C_string());
fieldDescriptor fd; // find_field initializes fd if found
@@ -87,9 +83,7 @@ BasicType VectorSupport::klass2bt(InstanceKlass* ik) {
assert(fd.is_static(), "");
assert(fd.offset() > 0, "");
- if (is_vector_shuffle(ik)) {
- return T_BYTE;
- } else if (is_vector_mask(ik)) {
+ if (is_vector_mask(ik)) {
return T_BOOLEAN;
} else { // vector and mask
oop value = ik->java_mirror()->obj_field(fd.offset());
diff --git a/src/hotspot/share/prims/vectorSupport.hpp b/src/hotspot/share/prims/vectorSupport.hpp
index 001484874e2..688fb595099 100644
--- a/src/hotspot/share/prims/vectorSupport.hpp
+++ b/src/hotspot/share/prims/vectorSupport.hpp
@@ -157,6 +157,5 @@ class VectorSupport : AllStatic {
static bool is_vector(Klass* klass);
static bool is_vector_mask(Klass* klass);
- static bool is_vector_shuffle(Klass* klass);
};
#endif // SHARE_PRIMS_VECTORSUPPORT_HPP
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 883557ac2e5..8f3e418a502 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -60,7 +60,6 @@
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "nmt/mallocSiteTable.hpp"
-#include "nmt/memTracker.hpp"
#include "oops/array.hpp"
#include "oops/compressedOops.hpp"
#include "oops/compressedOops.inline.hpp"
@@ -725,7 +724,6 @@ WB_END
WB_ENTRY(void, WB_NMTCommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
os::commit_memory((char *)(uintptr_t)addr, size, !ExecMem);
- MemTracker::record_virtual_memory_tag((address)(uintptr_t)addr, mtTest);
WB_END
WB_ENTRY(void, WB_NMTUncommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
diff --git a/src/hotspot/share/prims/whitebox.hpp b/src/hotspot/share/prims/whitebox.hpp
index c5072b97d4f..1d912bd663c 100644
--- a/src/hotspot/share/prims/whitebox.hpp
+++ b/src/hotspot/share/prims/whitebox.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 6737faf1e08..9205f6e713a 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -523,9 +523,9 @@ static SpecialFlag const special_jvm_flags[] = {
{ "DynamicDumpSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
{ "RequireSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
{ "UseSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
- { "DontYieldALot", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
#ifdef LINUX
{ "UseLinuxPosixThreadCPUClocks", JDK_Version::jdk(24), JDK_Version::jdk(25), JDK_Version::jdk(26) },
+ { "UseOprofile", JDK_Version::jdk(25), JDK_Version::jdk(26), JDK_Version::jdk(27) },
#endif
{ "LockingMode", JDK_Version::jdk(24), JDK_Version::jdk(26), JDK_Version::jdk(27) },
// --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
@@ -535,20 +535,7 @@ static SpecialFlag const special_jvm_flags[] = {
{ "MetaspaceReclaimPolicy", JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() },
{ "ZGenerational", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::undefined() },
- { "UseNotificationThread", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
- { "PreserveAllAnnotations", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
- { "UseEmptySlotsInSupers", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
- { "OldSize", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
-#if defined(X86)
- { "UseRTMLocking", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
- { "UseRTMDeopt", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
- { "RTMRetryCount", JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
-#endif // X86
-
-
- { "BaseFootPrintEstimate", JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
- { "HeapFirstMaximumCompactionCount", JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
- { "UseVtableBasedCHA", JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
+
#ifdef ASSERT
{ "DummyObsoleteTestFlag", JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() },
#endif
diff --git a/src/hotspot/share/runtime/escapeBarrier.cpp b/src/hotspot/share/runtime/escapeBarrier.cpp
index 410609beb95..86abb5b3752 100644
--- a/src/hotspot/share/runtime/escapeBarrier.cpp
+++ b/src/hotspot/share/runtime/escapeBarrier.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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.
*
diff --git a/src/hotspot/share/runtime/escapeBarrier.hpp b/src/hotspot/share/runtime/escapeBarrier.hpp
index 454e0b555e1..6a1d28bfeec 100644
--- a/src/hotspot/share/runtime/escapeBarrier.hpp
+++ b/src/hotspot/share/runtime/escapeBarrier.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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.
*
diff --git a/src/hotspot/share/runtime/jniHandles.cpp b/src/hotspot/share/runtime/jniHandles.cpp
index 00557dfc99b..4fb37af1796 100644
--- a/src/hotspot/share/runtime/jniHandles.cpp
+++ b/src/hotspot/share/runtime/jniHandles.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index db4f0f8c790..8bfda7db653 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -27,9 +27,11 @@
#include "jvm_md.h"
#include "runtime/osInfo.hpp"
+#include "utilities/align.hpp"
#include "utilities/exceptions.hpp"
-#include "utilities/ostream.hpp"
+#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
#ifdef __APPLE__
# include <mach/mach_time.h>
#endif
@@ -404,6 +406,9 @@ class os: AllStatic {
// Return the default page size.
static size_t vm_page_size() { return OSInfo::vm_page_size(); }
+ static size_t align_up_vm_page_size(size_t size) { return align_up (size, os::vm_page_size()); }
+ static size_t align_down_vm_page_size(size_t size) { return align_down(size, os::vm_page_size()); }
+
// The set of page sizes which the VM is allowed to use (may be a subset of
// the page sizes actually available on the platform).
static const PageSizes& page_sizes() { return _page_sizes; }
@@ -444,6 +449,8 @@ class os: AllStatic {
static size_t vm_allocation_granularity() { return OSInfo::vm_allocation_granularity(); }
+ static size_t align_up_vm_allocation_granularity(size_t size) { return align_up(size, os::vm_allocation_granularity()); }
+
// Returns the lowest address the process is allowed to map against.
static size_t vm_min_address();
@@ -1027,14 +1034,6 @@ class os: AllStatic {
class Posix;
#endif
- // FIXME - some random stuff that was in os_windows.hpp
-#ifdef _WINDOWS
- // strtok_s is the Windows thread-safe equivalent of POSIX strtok_r
-# define strtok_r strtok_s
-# define S_ISCHR(mode) (((mode) & _S_IFCHR) == _S_IFCHR)
-# define S_ISFIFO(mode) (((mode) & _S_IFIFO) == _S_IFIFO)
-#endif
-
#ifndef OS_NATIVE_THREAD_CREATION_FAILED_MSG
#define OS_NATIVE_THREAD_CREATION_FAILED_MSG "unable to create native thread: possibly out of memory or process/resource limits reached"
#endif
diff --git a/src/hotspot/share/runtime/osThread.hpp b/src/hotspot/share/runtime/osThread.hpp
index 597cf8e4d3f..15a19a3a140 100644
--- a/src/hotspot/share/runtime/osThread.hpp
+++ b/src/hotspot/share/runtime/osThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/osThreadBase.cpp b/src/hotspot/share/runtime/osThreadBase.cpp
index 7bb7ae6aa69..b3ef34f6508 100644
--- a/src/hotspot/share/runtime/osThreadBase.cpp
+++ b/src/hotspot/share/runtime/osThreadBase.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/osThreadBase.hpp b/src/hotspot/share/runtime/osThreadBase.hpp
index 4063da18519..cf343355fc1 100644
--- a/src/hotspot/share/runtime/osThreadBase.hpp
+++ b/src/hotspot/share/runtime/osThreadBase.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/perfData.hpp b/src/hotspot/share/runtime/perfData.hpp
index 1f75560715a..217343016b2 100644
--- a/src/hotspot/share/runtime/perfData.hpp
+++ b/src/hotspot/share/runtime/perfData.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/relocator.cpp b/src/hotspot/share/runtime/relocator.cpp
index dc244ce920d..5562a64551e 100644
--- a/src/hotspot/share/runtime/relocator.cpp
+++ b/src/hotspot/share/runtime/relocator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/serviceThread.hpp b/src/hotspot/share/runtime/serviceThread.hpp
index b3f76e08a4f..d029c64590e 100644
--- a/src/hotspot/share/runtime/serviceThread.hpp
+++ b/src/hotspot/share/runtime/serviceThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/stackOverflow.hpp b/src/hotspot/share/runtime/stackOverflow.hpp
index 4734a6c6788..6238d3869c3 100644
--- a/src/hotspot/share/runtime/stackOverflow.hpp
+++ b/src/hotspot/share/runtime/stackOverflow.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/statSampler.cpp b/src/hotspot/share/runtime/statSampler.cpp
index bbd8d3096bb..9f86035f338 100644
--- a/src/hotspot/share/runtime/statSampler.cpp
+++ b/src/hotspot/share/runtime/statSampler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/statSampler.hpp b/src/hotspot/share/runtime/statSampler.hpp
index 00daa5d95c0..b42700caffa 100644
--- a/src/hotspot/share/runtime/statSampler.hpp
+++ b/src/hotspot/share/runtime/statSampler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/timerTrace.hpp b/src/hotspot/share/runtime/timerTrace.hpp
index ae632c0b46d..2dfeae64f9b 100644
--- a/src/hotspot/share/runtime/timerTrace.hpp
+++ b/src/hotspot/share/runtime/timerTrace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/runtime/trimNativeHeap.cpp b/src/hotspot/share/runtime/trimNativeHeap.cpp
index ca9f74a04ed..b7202763034 100644
--- a/src/hotspot/share/runtime/trimNativeHeap.cpp
+++ b/src/hotspot/share/runtime/trimNativeHeap.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2023 SAP SE. All rights reserved.
* Copyright (c) 2023 Red Hat Inc. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/services/threadIdTable.cpp b/src/hotspot/share/services/threadIdTable.cpp
index 90d17532c4d..bc03edad151 100644
--- a/src/hotspot/share/services/threadIdTable.cpp
+++ b/src/hotspot/share/services/threadIdTable.cpp
@@ -1,6 +1,6 @@
/*
-* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utilities/align.hpp b/src/hotspot/share/utilities/align.hpp
index 4640f05e4d0..b67e61036a0 100644
--- a/src/hotspot/share/utilities/align.hpp
+++ b/src/hotspot/share/utilities/align.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utilities/copy.hpp b/src/hotspot/share/utilities/copy.hpp
index 16b596e199b..7262bc61073 100644
--- a/src/hotspot/share/utilities/copy.hpp
+++ b/src/hotspot/share/utilities/copy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utilities/elfFuncDescTable.cpp b/src/hotspot/share/utilities/elfFuncDescTable.cpp
index d23a1da68f4..756ff1fa978 100644
--- a/src/hotspot/share/utilities/elfFuncDescTable.cpp
+++ b/src/hotspot/share/utilities/elfFuncDescTable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/utilities/elfFuncDescTable.hpp b/src/hotspot/share/utilities/elfFuncDescTable.hpp
index daba24ee626..31fd9c25d25 100644
--- a/src/hotspot/share/utilities/elfFuncDescTable.hpp
+++ b/src/hotspot/share/utilities/elfFuncDescTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/hotspot/share/utilities/globalCounter.hpp b/src/hotspot/share/utilities/globalCounter.hpp
index b336ed4a1da..c78831acfa5 100644
--- a/src/hotspot/share/utilities/globalCounter.hpp
+++ b/src/hotspot/share/utilities/globalCounter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utilities/globalDefinitions_visCPP.hpp b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
index 5f26a082d7c..3f22948118d 100644
--- a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
@@ -37,6 +37,7 @@
# include <stdlib.h>
# include <stdint.h>
# include <stddef.h>// for offsetof
+# include <sys/stat.h>
# include <io.h> // for stream.cpp
# include <float.h> // for _isnan
# include <stdio.h> // for va_list
@@ -80,6 +81,18 @@ inline int strncasecmp(const char *s1, const char *s2, size_t n) {
return _strnicmp(s1,s2,n);
}
+// VS doesn't provide strtok_r, which is a POSIX function. Instead, it
+// provides the same function under the name strtok_s. Note that this is
+// *not* the same as the C99 Annex K strtok_s. VS provides that function
+// under the name strtok_s_l. Make strtok_r a synonym so we can use that name
+// in shared code.
+const auto strtok_r = strtok_s;
+
+// VS doesn't provide POSIX macros S_ISFIFO or S_IFIFO. It doesn't even
+// provide _S_ISFIFO, per its usual naming convention for POSIX stuff. But it
+// does provide _S_IFIFO, so we can roll our own S_ISFIFO.
+#define S_ISFIFO(mode) (((mode) & _S_IFIFO) == _S_IFIFO)
+
// Checking for nanness
inline int g_isnan(jfloat f) { return _isnan(f); }
diff --git a/src/hotspot/share/utilities/nonblockingQueue.hpp b/src/hotspot/share/utilities/nonblockingQueue.hpp
index 814132809fa..1b7e4b8bac4 100644
--- a/src/hotspot/share/utilities/nonblockingQueue.hpp
+++ b/src/hotspot/share/utilities/nonblockingQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utilities/population_count.hpp b/src/hotspot/share/utilities/population_count.hpp
index 0cf35d325dc..aa337bb09f8 100644
--- a/src/hotspot/share/utilities/population_count.hpp
+++ b/src/hotspot/share/utilities/population_count.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utilities/spinYield.cpp b/src/hotspot/share/utilities/spinYield.cpp
index 0b331a49784..b774e5935a2 100644
--- a/src/hotspot/share/utilities/spinYield.cpp
+++ b/src/hotspot/share/utilities/spinYield.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utilities/waitBarrier_generic.hpp b/src/hotspot/share/utilities/waitBarrier_generic.hpp
index e980b3022ef..8ed9ef3ac6e 100644
--- a/src/hotspot/share/utilities/waitBarrier_generic.hpp
+++ b/src/hotspot/share/utilities/waitBarrier_generic.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java b/src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java
index 202d070c493..de4402682ef 100644
--- a/src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c b/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c
index d1397fe4546..9e1d092c57d 100644
--- a/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c
+++ b/src/java.base/macosx/native/libjava/ProcessHandleImpl_macosx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/macosx/native/libosxsecurity/KeystoreImpl.m b/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m
index cca343650da..31572eaeb81 100644
--- a/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m
+++ b/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/com/sun/crypto/provider/PBEKey.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java
index 21dc463572e..8af64b11ac8 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/com/sun/security/ntlm/Server.java b/src/java.base/share/classes/com/sun/security/ntlm/Server.java
index ba0bd984e6c..25d5efc5781 100644
--- a/src/java.base/share/classes/com/sun/security/ntlm/Server.java
+++ b/src/java.base/share/classes/com/sun/security/ntlm/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/io/ObjectStreamConstants.java b/src/java.base/share/classes/java/io/ObjectStreamConstants.java
index 4f06ba7f89e..1768a9667a2 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamConstants.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/io/PipedInputStream.java b/src/java.base/share/classes/java/io/PipedInputStream.java
index 01641773fbd..a38dc6d9be8 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, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/io/PipedOutputStream.java b/src/java.base/share/classes/java/io/PipedOutputStream.java
index 3219e92b57d..bfa8f0bbb5a 100644
--- a/src/java.base/share/classes/java/io/PipedOutputStream.java
+++ b/src/java.base/share/classes/java/io/PipedOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/io/PipedReader.java b/src/java.base/share/classes/java/io/PipedReader.java
index 6e383e9258d..9f96072d0c7 100644
--- a/src/java.base/share/classes/java/io/PipedReader.java
+++ b/src/java.base/share/classes/java/io/PipedReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/io/PipedWriter.java b/src/java.base/share/classes/java/io/PipedWriter.java
index 90e18796202..5aaa60c2f0b 100644
--- a/src/java.base/share/classes/java/io/PipedWriter.java
+++ b/src/java.base/share/classes/java/io/PipedWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/io/Serializable.java b/src/java.base/share/classes/java/io/Serializable.java
index cf04ba2e60c..b348a000878 100644
--- a/src/java.base/share/classes/java/io/Serializable.java
+++ b/src/java.base/share/classes/java/io/Serializable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/io/StreamTokenizer.java b/src/java.base/share/classes/java/io/StreamTokenizer.java
index f6c5c7502b3..69806537f85 100644
--- a/src/java.base/share/classes/java/io/StreamTokenizer.java
+++ b/src/java.base/share/classes/java/io/StreamTokenizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/io/WriteAbortedException.java b/src/java.base/share/classes/java/io/WriteAbortedException.java
index 3f79b70a34d..aaa5c724746 100644
--- a/src/java.base/share/classes/java/io/WriteAbortedException.java
+++ b/src/java.base/share/classes/java/io/WriteAbortedException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/AssertionError.java b/src/java.base/share/classes/java/lang/AssertionError.java
index c49760aa8a0..f27bbb28452 100644
--- a/src/java.base/share/classes/java/lang/AssertionError.java
+++ b/src/java.base/share/classes/java/lang/AssertionError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/BaseVirtualThread.java b/src/java.base/share/classes/java/lang/BaseVirtualThread.java
index 6d5ed4235e7..f0d02f5dbf3 100644
--- a/src/java.base/share/classes/java/lang/BaseVirtualThread.java
+++ b/src/java.base/share/classes/java/lang/BaseVirtualThread.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/BootstrapMethodError.java b/src/java.base/share/classes/java/lang/BootstrapMethodError.java
index 1f46ca69faa..098300efc8d 100644
--- a/src/java.base/share/classes/java/lang/BootstrapMethodError.java
+++ b/src/java.base/share/classes/java/lang/BootstrapMethodError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/ClassValue.java b/src/java.base/share/classes/java/lang/ClassValue.java
index 05046b82523..612693de0a7 100644
--- a/src/java.base/share/classes/java/lang/ClassValue.java
+++ b/src/java.base/share/classes/java/lang/ClassValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/ExceptionInInitializerError.java b/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java
index d26701672d9..5d620457851 100644
--- a/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java
+++ b/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java
index 6db10113c8a..095cfa86ef8 100644
--- a/src/java.base/share/classes/java/lang/StrictMath.java
+++ b/src/java.base/share/classes/java/lang/StrictMath.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/classfile/ClassFile.java b/src/java.base/share/classes/java/lang/classfile/ClassFile.java
index 3d1ce73c7b6..b4fb85ebc93 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassFile.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassFile.java
@@ -32,6 +32,8 @@
import java.lang.classfile.constantpool.ClassEntry;
import java.lang.classfile.constantpool.ConstantPoolBuilder;
import java.lang.classfile.constantpool.Utf8Entry;
+import java.lang.classfile.instruction.BranchInstruction;
+import java.lang.classfile.instruction.DiscontinuedInstruction;
import java.lang.classfile.instruction.ExceptionCatch;
import java.lang.constant.ClassDesc;
import java.lang.reflect.AccessFlag;
@@ -230,17 +232,35 @@ enum LineNumbersOption implements Option {
/**
* Option describing whether to automatically rewrite short jumps to
* long when necessary.
- * Default is {@code FIX_SHORT_JUMPS} to automatically rewrite jump
+ * Default is {@link #FIX_SHORT_JUMPS} to automatically rewrite jump
* instructions.
+ * <p>
+ * Due to physical restrictions, some types of instructions cannot encode
+ * certain jump targets with bci offsets less than -32768 or greater than
+ * 32767, as they use a {@code s2} to encode such an offset. (The maximum
+ * length of the {@code code} array is 65535.) These types of instructions
+ * are called "short jumps".
*
+ * @see BranchInstruction
+ * @see DiscontinuedInstruction.JsrInstruction
* @since 24
*/
enum ShortJumpsOption implements Option {
- /** Automatically convert short jumps to long when necessary */
+ /**
+ * Automatically convert short jumps to long when necessary.
+ * <p>
+ * For an invalid instruction model, a {@link CodeBuilder} may generate
+ * another or a few other instructions to accomplish the same effect.
+ */
FIX_SHORT_JUMPS,
- /** Fail if short jump overflows */
+ /**
+ * Fail with an {@link IllegalArgumentException} if short jump overflows.
+ * <p>
+ * This is useful to ensure the physical accuracy of a generated {@code
+ * class} file.
+ */
FAIL_ON_SHORT_JUMPS
}
diff --git a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
index 1a074c1554a..3cbcb893cb1 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
@@ -51,7 +51,7 @@
* #with(ClassFileElement)} or concretely by calling the various {@code withXxx}
* methods.
*
- * <h2>Instruction Factories</h2>
+ * <h2 id="instruction-factories">Instruction Factories</h2>
* {@code CodeBuilder} provides convenience methods to create instructions (See
* JVMS {@jvms 6.5} Instructions) by their mnemonic, taking necessary operands.
* <ul>
diff --git a/src/java.base/share/classes/java/lang/classfile/CompoundElement.java b/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
index 38d149623e1..d9f9fe1e5f9 100644
--- a/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
+++ b/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
@@ -34,6 +34,8 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
+import jdk.internal.classfile.components.ClassPrinter;
+
/**
* A {@link ClassFileElement} that has complex structure defined in terms of
* other classfile elements, such as a method, field, method body, or entire
@@ -92,4 +94,14 @@ public void accept(E e) {
return Collections.unmodifiableList(list);
}
+ /**
+ * {@return a text representation of the compound element and its contents for debugging purposes}
+ *
+ * The format, structure and exact contents of the returned string are not specified and may change at any time in the future.
+ */
+ default String toDebugString() {
+ StringBuilder text = new StringBuilder();
+ ClassPrinter.toYaml(this, ClassPrinter.Verbosity.TRACE_ALL, text::append);
+ return text.toString();
+ }
}
diff --git a/src/java.base/share/classes/java/lang/classfile/Instruction.java b/src/java.base/share/classes/java/lang/classfile/Instruction.java
index 2fe0ec5a588..199aa6447a1 100644
--- a/src/java.base/share/classes/java/lang/classfile/Instruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/Instruction.java
@@ -25,13 +25,20 @@
package java.lang.classfile;
+import java.lang.classfile.attribute.CodeAttribute;
import java.lang.classfile.instruction.*;
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models an executable instruction in a method body.
+ * Models an executable instruction in the {@code code} array of the {@link
+ * CodeAttribute Code} attribute of a method.
+ * <p>
+ * The {@link #opcode() opcode} identifies the operation of an instruction.
+ * Each {@linkplain Opcode#kind() kind} of opcode has its own modeling interface
+ * for instructions.
*
+ * @sealedGraph
* @since 24
*/
public sealed interface Instruction extends CodeElement
@@ -46,12 +53,14 @@ public sealed interface Instruction extends CodeElement
ThrowInstruction, TypeCheckInstruction, AbstractInstruction {
/**
- * {@return the opcode of this instruction}
+ * {@return the operation of this instruction}
*/
Opcode opcode();
/**
* {@return the size in bytes of this instruction}
+ * This value is equal to {@link Opcode#sizeIfFixed()
+ * opcode().sizeIfFixed()} if it is not {@code -1}.
*/
int sizeInBytes();
}
diff --git a/src/java.base/share/classes/java/lang/classfile/Label.java b/src/java.base/share/classes/java/lang/classfile/Label.java
index e958e116084..653c410728c 100644
--- a/src/java.base/share/classes/java/lang/classfile/Label.java
+++ b/src/java.base/share/classes/java/lang/classfile/Label.java
@@ -24,21 +24,60 @@
*/
package java.lang.classfile;
+import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.instruction.LabelTarget;
+import java.util.ListIterator;
+
import jdk.internal.classfile.impl.LabelImpl;
/**
* A marker for a position within the instructions of a method body. The
- * association between a label's identity and the position it represents is
- * managed by the entity managing the method body (a {@link CodeModel} or {@link
- * CodeBuilder}), not the label itself; this allows the same label to have a
- * meaning both in an existing method (as managed by a {@linkplain CodeModel})
- * and in the transformation of that method (as managed by a {@linkplain
- * CodeBuilder}), while corresponding to different positions in each. When
- * traversing the elements of a {@linkplain CodeModel}, {@linkplain Label}
- * markers will be delivered at the position to which they correspond. A label
- * can be bound to the current position within a {@linkplain CodeBuilder} via
- * {@link CodeBuilder#labelBinding(Label)} or {@link CodeBuilder#with(ClassFileElement)}.
+ * position is a cursor position in the list of instructions, similar to that
+ * of a {@link ListIterator}.
+ *
+ * <h2 id="reading">Reading Labels</h2>
+ * Labels read from {@code class} files represent positions in the {@code code}
+ * array of a {@link CodeAttribute Code} attribute. It is associated with a
+ * <dfn>{@index bci}</dfn> (bytecode index), also known as <dfn>{@index pc}</dfn>
+ * (program counter), the index into the {@code code} array; the actual cursor
+ * position is immediately before the given index, so a label at the beginning
+ * of the instructions has bci {@code 0}, and a label at the end of the
+ * instructions has bci {@link CodeAttribute#codeLength codeLength() + 1}. The
+ * bci can be inspected through {@link CodeAttribute#labelToBci
+ * CodeAttribute::labelToBci}.
+ * <p>
+ * In generic {@link CodeModel}s, a label may not have a bci value; the position
+ * of a label can be found by searching for the corresponding {@link LabelTarget}
+ * within that model.
+ *
+ * <h2 id="writing">Writing Labels</h2>
+ * Many models in {@link java.lang.classfile} refer to labels. To write a
+ * label, a label must be obtained, it must be bound to a {@link CodeBuilder}.
+ * <p>
+ * To obtain a label:
+ * <ul>
+ * <li>Use a label read from other models.
+ * <li>Use pre-defined labels from a {@link CodeBuilder}, such as {@link
+ * CodeBuilder#startLabel() CodeBuilder::startLabel}, {@link CodeBuilder#endLabel
+ * CodeBuilder::endLabel}, or {@link CodeBuilder.BlockCodeBuilder#breakLabel
+ * BlockCodeBuilder::breakLabel}. They are already bound.
+ * <li>Create labels with {@link CodeBuilder#newLabel CodeBuilder::newLabel} or
+ * {@link CodeBuilder#newBoundLabel CodeBuilder::newBoundLabel}.
+ * </ul>
+ * <p>
+ * A label must be bound exactly once in the {@code CodeBuilder} where it is
+ * used; otherwise, writing fails. To bind an unbound label:
+ * <ul>
+ * <li>Send a read {@link LabelTarget} to a {@code CodeBuilder}.
+ * <li>Use {@link CodeBuilder#labelBinding CodeBuilder::labelBinding}.
+ * </ul>
+ * Note that a label read from another model is not automatically bound in a
+ * {@code CodeBuilder}; they are separate entities and the label is bound to
+ * different positions in them.
*
+ * @see CodeAttribute#labelToBci CodeAttribute::labelToBci
+ * @see CodeBuilder#newLabel CodeBuilder::newLabel
+ * @see CodeBuilder#labelBinding CodeBuilder::labelBinding
* @since 24
*/
public sealed interface Label
diff --git a/src/java.base/share/classes/java/lang/classfile/Opcode.java b/src/java.base/share/classes/java/lang/classfile/Opcode.java
index 4d333400001..a3b0a370763 100644
--- a/src/java.base/share/classes/java/lang/classfile/Opcode.java
+++ b/src/java.base/share/classes/java/lang/classfile/Opcode.java
@@ -24,684 +24,1849 @@
*/
package java.lang.classfile;
+import java.lang.classfile.instruction.*;
+
import jdk.internal.classfile.impl.RawBytecodeHelper;
/**
* Describes the opcodes of the JVM instruction set, as described in JVMS {@jvms 6.5}.
- * As well as a number of pseudo-instructions that may be encountered when
- * traversing the instructions of a method.
+ * This includes a few pseudo-opcodes modified by {@link #isWide() wide}.
+ * <p>
+ * An opcode describes the operation of an instruction.
+ *
+ * @apiNote
+ * The enum constants are named after the opcodes' mnemonics in uppercase.
+ * Wide pseudo-opcodes are named with the original opcodes' mnemonic plus
+ * a {@code _W} suffix. However, {@link #LDC_W ldc_w}, {@link #LDC2_W ldc2_w},
+ * {@link #GOTO_W goto_w}, and {@link #JSR_W jsr_w} are legitimate opcodes
+ * instead of wide pseudo-opcodes.
*
* @see Instruction
- * @see PseudoInstruction
*
* @since 24
*/
public enum Opcode {
- /** Do nothing */
+ /**
+ * Do nothing.
+ *
+ * @jvms 6.5.nop <em>nop</em>
+ * @see Kind#NOP
+ */
NOP(RawBytecodeHelper.NOP, 1, Kind.NOP),
- /** Push null */
+ /**
+ * Push {@code null}.
+ *
+ * @jvms 6.5.aconst_null <em>aconst_null</em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
ACONST_NULL(RawBytecodeHelper.ACONST_NULL, 1, Kind.CONSTANT),
- /** Push int constant -1 */
+ /**
+ * Push {@link TypeKind#INT int} constant {@code -1}.
+ *
+ * @jvms 6.5.iconst_i <em>iconst_<i></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
ICONST_M1(RawBytecodeHelper.ICONST_M1, 1, Kind.CONSTANT),
- /** Push int constant 0 */
+ /**
+ * Push {@link TypeKind#INT int} constant {@code 0}.
+ *
+ * @jvms 6.5.iconst_i <em>iconst_<i></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
ICONST_0(RawBytecodeHelper.ICONST_0, 1, Kind.CONSTANT),
- /** Push int constant 1 */
+ /**
+ * Push {@link TypeKind#INT int} constant {@code 1}.
+ *
+ * @jvms 6.5.iconst_i <em>iconst_<i></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
ICONST_1(RawBytecodeHelper.ICONST_1, 1, Kind.CONSTANT),
- /** Push int constant 2 */
+ /**
+ * Push {@link TypeKind#INT int} constant {@code 2}.
+ *
+ * @jvms 6.5.iconst_i <em>iconst_<i></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
ICONST_2(RawBytecodeHelper.ICONST_2, 1, Kind.CONSTANT),
- /** Push int constant 3 */
+ /**
+ * Push {@link TypeKind#INT int} constant {@code 3}.
+ *
+ * @jvms 6.5.iconst_i <em>iconst_<i></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
ICONST_3(RawBytecodeHelper.ICONST_3, 1, Kind.CONSTANT),
- /** Push int constant 4 */
+ /**
+ * Push {@link TypeKind#INT int} constant {@code 4}.
+ *
+ * @jvms 6.5.iconst_i <em>iconst_<i></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
ICONST_4(RawBytecodeHelper.ICONST_4, 1, Kind.CONSTANT),
- /** Push int constant 5 */
+ /**
+ * Push {@link TypeKind#INT int} constant {@code 5}.
+ *
+ * @jvms 6.5.iconst_i <em>iconst_<i></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
ICONST_5(RawBytecodeHelper.ICONST_5, 1, Kind.CONSTANT),
- /** Push long constant 0 */
+ /**
+ * Push {@link TypeKind#LONG long} constant {@code 0L}.
+ *
+ * @jvms 6.5.lconst_l <em>lconst_<l></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
LCONST_0(RawBytecodeHelper.LCONST_0, 1, Kind.CONSTANT),
- /** Push long constant 1 */
+ /**
+ * Push {@link TypeKind#LONG long} constant {@code 1L}.
+ *
+ * @jvms 6.5.lconst_l <em>lconst_<l></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
LCONST_1(RawBytecodeHelper.LCONST_1, 1, Kind.CONSTANT),
- /** Push float constant 0 */
+ /**
+ * Push {@link TypeKind#FLOAT float} constant {@code 0.0F}.
+ *
+ * @jvms 6.5.fconst_f <em>fconst_<f></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
FCONST_0(RawBytecodeHelper.FCONST_0, 1, Kind.CONSTANT),
- /** Push float constant 1 */
+ /**
+ * Push {@link TypeKind#FLOAT float} constant {@code 1.0F}.
+ *
+ * @jvms 6.5.fconst_f <em>fconst_<f></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
FCONST_1(RawBytecodeHelper.FCONST_1, 1, Kind.CONSTANT),
- /** Push float constant 2 */
+ /**
+ * Push {@link TypeKind#FLOAT float} constant {@code 2.0F}.
+ *
+ * @jvms 6.5.fconst_f <em>fconst_<f></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
FCONST_2(RawBytecodeHelper.FCONST_2, 1, Kind.CONSTANT),
- /** Push double constant 0 */
+ /**
+ * Push {@link TypeKind#DOUBLE double} constant {@code 0.0D}.
+ *
+ * @jvms 6.5.dconst_d <em>dconst_<d></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
DCONST_0(RawBytecodeHelper.DCONST_0, 1, Kind.CONSTANT),
- /** Push double constant 1 */
+ /**
+ * Push {@link TypeKind#DOUBLE double} constant {@code 1.0D}.
+ *
+ * @jvms 6.5.dconst_d <em>dconst_<d></em>
+ * @see ConstantInstruction.IntrinsicConstantInstruction
+ * @see Kind#CONSTANT
+ */
DCONST_1(RawBytecodeHelper.DCONST_1, 1, Kind.CONSTANT),
- /** Push byte */
+ /**
+ * Push {@link TypeKind#INT int} value from sign-extension of immediate
+ * {@link TypeKind#BYTE byte} value.
+ *
+ * @jvms 6.5.bipush <em>bipush</em>
+ * @see ConstantInstruction.ArgumentConstantInstruction
+ * @see Kind#CONSTANT
+ */
BIPUSH(RawBytecodeHelper.BIPUSH, 2, Kind.CONSTANT),
- /** Push short */
+ /**
+ * Push {@link TypeKind#INT int} value from sign-extension of immediate
+ * {@link TypeKind#SHORT short} value.
+ *
+ * @jvms 6.5.sipush <em>sipush</em>
+ * @see ConstantInstruction.ArgumentConstantInstruction
+ * @see Kind#CONSTANT
+ */
SIPUSH(RawBytecodeHelper.SIPUSH, 3, Kind.CONSTANT),
- /** Push item from run-time constant pool */
+ /**
+ * Push item from run-time constant pool.
+ *
+ * @jvms 6.5.ldc <em>ldc</em>
+ * @see ConstantInstruction.LoadConstantInstruction
+ * @see Kind#CONSTANT
+ */
LDC(RawBytecodeHelper.LDC, 2, Kind.CONSTANT),
- /** Push item from run-time constant pool (wide index) */
+ /**
+ * Push item from run-time constant pool (wide index).
+ *
+ * @jvms 6.5.ldc_w <em>ldc_w</em>
+ * @see ConstantInstruction.LoadConstantInstruction
+ * @see Kind#CONSTANT
+ */
LDC_W(RawBytecodeHelper.LDC_W, 3, Kind.CONSTANT),
- /** Push long or double from run-time constant pool (wide index) */
+ /**
+ * Push {@link TypeKind#LONG long} or {@link TypeKind#DOUBLE double}
+ * from run-time constant pool (wide index).
+ *
+ * @jvms 6.5.ldc2_w <em>ldc2_w</em>
+ * @see ConstantInstruction.LoadConstantInstruction
+ * @see Kind#CONSTANT
+ */
LDC2_W(RawBytecodeHelper.LDC2_W, 3, Kind.CONSTANT),
- /** Load int from local variable */
+ /**
+ * Load {@link TypeKind#INT int} from local variable.
+ *
+ * @jvms 6.5.iload <em>iload</em>
+ * @see Kind#LOAD
+ */
ILOAD(RawBytecodeHelper.ILOAD, 2, Kind.LOAD),
- /** Load long from local variable */
+ /**
+ * Load {@link TypeKind#LONG long} from local variable.
+ *
+ * @jvms 6.5.lload <em>lload</em>
+ * @see Kind#LOAD
+ */
LLOAD(RawBytecodeHelper.LLOAD, 2, Kind.LOAD),
- /** Load float from local variable */
+ /**
+ * Load {@link TypeKind#FLOAT float} from local variable.
+ *
+ * @jvms 6.5.fload <em>fload</em>
+ * @see Kind#LOAD
+ */
FLOAD(RawBytecodeHelper.FLOAD, 2, Kind.LOAD),
- /** Load double from local variable */
+ /**
+ * Load {@link TypeKind#DOUBLE double} from local variable.
+ *
+ * @jvms 6.5.dload <em>dload</em>
+ * @see Kind#LOAD
+ */
DLOAD(RawBytecodeHelper.DLOAD, 2, Kind.LOAD),
- /** Load reference from local variable */
+ /**
+ * Load {@link TypeKind#REFERENCE reference} from local variable.
+ *
+ * @jvms 6.5.aload <em>aload</em>
+ * @see Kind#LOAD
+ */
ALOAD(RawBytecodeHelper.ALOAD, 2, Kind.LOAD),
- /** Load int from local variable 0 */
+ /**
+ * Load {@link TypeKind#INT int} from local variable slot {@code 0}.
+ *
+ * @jvms 6.5.iload_n <em>iload_<n></em>
+ * @see Kind#LOAD
+ */
ILOAD_0(RawBytecodeHelper.ILOAD_0, 1, Kind.LOAD),
- /** Load int from local variable 1 */
+ /**
+ * Load {@link TypeKind#INT int} from local variable slot {@code 1}.
+ *
+ * @jvms 6.5.iload_n <em>iload_<n></em>
+ * @see Kind#LOAD
+ */
ILOAD_1(RawBytecodeHelper.ILOAD_1, 1, Kind.LOAD),
- /** Load int from local variable 2 */
+ /**
+ * Load {@link TypeKind#INT int} from local variable slot {@code 2}.
+ *
+ * @jvms 6.5.iload_n <em>iload_<n></em>
+ * @see Kind#LOAD
+ */
ILOAD_2(RawBytecodeHelper.ILOAD_2, 1, Kind.LOAD),
- /** Load int from local variable3 */
+ /**
+ * Load {@link TypeKind#INT int} from local variable slot {@code 3}.
+ *
+ * @jvms 6.5.iload_n <em>iload_<n></em>
+ * @see Kind#LOAD
+ */
ILOAD_3(RawBytecodeHelper.ILOAD_3, 1, Kind.LOAD),
- /** Load long from local variable 0 */
+ /**
+ * Load {@link TypeKind#LONG long} from local variable slot {@code 0}.
+ *
+ * @jvms 6.5.lload_n <em>lload_<n></em>
+ * @see Kind#LOAD
+ */
LLOAD_0(RawBytecodeHelper.LLOAD_0, 1, Kind.LOAD),
- /** Load long from local variable 1 */
+ /**
+ * Load {@link TypeKind#LONG long} from local variable slot {@code 1}.
+ *
+ * @jvms 6.5.lload_n <em>lload_<n></em>
+ * @see Kind#LOAD
+ */
LLOAD_1(RawBytecodeHelper.LLOAD_1, 1, Kind.LOAD),
- /** Load long from local variable 2 */
+ /**
+ * Load {@link TypeKind#LONG long} from local variable slot {@code 2}.
+ *
+ * @jvms 6.5.lload_n <em>lload_<n></em>
+ * @see Kind#LOAD
+ */
LLOAD_2(RawBytecodeHelper.LLOAD_2, 1, Kind.LOAD),
- /** Load long from local variable 3 */
+ /**
+ * Load {@link TypeKind#LONG long} from local variable slot {@code 3}.
+ *
+ * @jvms 6.5.lload_n <em>lload_<n></em>
+ * @see Kind#LOAD
+ */
LLOAD_3(RawBytecodeHelper.LLOAD_3, 1, Kind.LOAD),
- /** Load float from local variable 0 */
+ /**
+ * Load {@link TypeKind#FLOAT float} from local variable slot {@code 0}.
+ *
+ * @jvms 6.5.fload_n <em>fload_<n></em>
+ * @see Kind#LOAD
+ */
FLOAD_0(RawBytecodeHelper.FLOAD_0, 1, Kind.LOAD),
- /** Load float from local variable 1 */
+ /**
+ * Load {@link TypeKind#FLOAT float} from local variable slot {@code 1}.
+ *
+ * @jvms 6.5.fload_n <em>fload_<n></em>
+ * @see Kind#LOAD
+ */
FLOAD_1(RawBytecodeHelper.FLOAD_1, 1, Kind.LOAD),
- /** Load float from local variable 2 */
+ /**
+ * Load {@link TypeKind#FLOAT float} from local variable slot {@code 2}.
+ *
+ * @jvms 6.5.fload_n <em>fload_<n></em>
+ * @see Kind#LOAD
+ */
FLOAD_2(RawBytecodeHelper.FLOAD_2, 1, Kind.LOAD),
- /** Load float from local variable 3 */
+ /**
+ * Load {@link TypeKind#FLOAT float} from local variable slot {@code 3}.
+ *
+ * @jvms 6.5.fload_n <em>fload_<n></em>
+ * @see Kind#LOAD
+ */
FLOAD_3(RawBytecodeHelper.FLOAD_3, 1, Kind.LOAD),
- /** Load double from local variable 0 */
+ /**
+ * Load {@link TypeKind#DOUBLE double} from local variable slot {@code 0}.
+ *
+ * @jvms 6.5.dload_n <em>dload_<n></em>
+ * @see Kind#LOAD
+ */
DLOAD_0(RawBytecodeHelper.DLOAD_0, 1, Kind.LOAD),
- /** Load double from local variable 1 */
+ /**
+ * Load {@link TypeKind#DOUBLE double} from local variable slot {@code 1}.
+ *
+ * @jvms 6.5.dload_n <em>dload_<n></em>
+ * @see Kind#LOAD
+ */
DLOAD_1(RawBytecodeHelper.DLOAD_1, 1, Kind.LOAD),
- /** Load double from local variable 2 */
+ /**
+ * Load {@link TypeKind#DOUBLE double} from local variable slot {@code 2}.
+ *
+ * @jvms 6.5.dload_n <em>dload_<n></em>
+ * @see Kind#LOAD
+ */
DLOAD_2(RawBytecodeHelper.DLOAD_2, 1, Kind.LOAD),
- /** Load double from local variable 3 */
+ /**
+ * Load {@link TypeKind#DOUBLE double} from local variable slot {@code 3}.
+ *
+ * @jvms 6.5.dload_n <em>dload_<n></em>
+ * @see Kind#LOAD
+ */
DLOAD_3(RawBytecodeHelper.DLOAD_3, 1, Kind.LOAD),
- /** Load reference from local variable 0 */
+ /**
+ * Load {@link TypeKind#REFERENCE reference} from local variable slot {@code 0}.
+ *
+ * @jvms 6.5.aload_n <em>aload_<n></em>
+ * @see Kind#LOAD
+ */
ALOAD_0(RawBytecodeHelper.ALOAD_0, 1, Kind.LOAD),
- /** Load reference from local variable 1 */
+ /**
+ * Load {@link TypeKind#REFERENCE reference} from local variable slot {@code 1}.
+ *
+ * @jvms 6.5.aload_n <em>aload_<n></em>
+ * @see Kind#LOAD
+ */
ALOAD_1(RawBytecodeHelper.ALOAD_1, 1, Kind.LOAD),
- /** Load reference from local variable 2 */
+ /**
+ * Load {@link TypeKind#REFERENCE reference} from local variable slot {@code 2}.
+ *
+ * @jvms 6.5.aload_n <em>aload_<n></em>
+ * @see Kind#LOAD
+ */
ALOAD_2(RawBytecodeHelper.ALOAD_2, 1, Kind.LOAD),
- /** Load reference from local variable 3 */
+ /**
+ * Load {@link TypeKind#REFERENCE reference} from local variable slot {@code 3}.
+ *
+ * @jvms 6.5.aload_n <em>aload_<n></em>
+ * @see Kind#LOAD
+ */
ALOAD_3(RawBytecodeHelper.ALOAD_3, 1, Kind.LOAD),
- /** Load int from array */
+ /**
+ * Load {@link TypeKind#INT int} from array.
+ *
+ * @jvms 6.5.iaload <em>iaload</em>
+ * @see Kind#ARRAY_LOAD
+ */
IALOAD(RawBytecodeHelper.IALOAD, 1, Kind.ARRAY_LOAD),
- /** Load long from array */
+ /**
+ * Load {@link TypeKind#LONG long} from array.
+ *
+ * @jvms 6.5.laload <em>laload</em>
+ * @see Kind#ARRAY_LOAD
+ */
LALOAD(RawBytecodeHelper.LALOAD, 1, Kind.ARRAY_LOAD),
- /** Load float from array */
+ /**
+ * Load {@link TypeKind#FLOAT float} from array.
+ *
+ * @jvms 6.5.faload <em>faload</em>
+ * @see Kind#ARRAY_LOAD
+ */
FALOAD(RawBytecodeHelper.FALOAD, 1, Kind.ARRAY_LOAD),
- /** Load double from array */
+ /**
+ * Load {@link TypeKind#DOUBLE double} from array.
+ *
+ * @jvms 6.5.daload <em>daload</em>
+ * @see Kind#ARRAY_LOAD
+ */
DALOAD(RawBytecodeHelper.DALOAD, 1, Kind.ARRAY_LOAD),
- /** Load reference from array */
+ /**
+ * Load {@link TypeKind#REFERENCE reference} from array.
+ *
+ * @jvms 6.5.aaload <em>aaload</em>
+ * @see Kind#ARRAY_LOAD
+ */
AALOAD(RawBytecodeHelper.AALOAD, 1, Kind.ARRAY_LOAD),
- /** Load byte from array */
+ /**
+ * Load {@link TypeKind#BYTE byte} or {@link TypeKind#BOOLEAN boolean} from array.
+ *
+ * @jvms 6.5.baload <em>baload</em>
+ * @see Kind#ARRAY_LOAD
+ */
BALOAD(RawBytecodeHelper.BALOAD, 1, Kind.ARRAY_LOAD),
- /** Load char from array */
+ /**
+ * Load {@link TypeKind#CHAR char} from array.
+ *
+ * @jvms 6.5.caload <em>caload</em>
+ * @see Kind#ARRAY_LOAD
+ */
CALOAD(RawBytecodeHelper.CALOAD, 1, Kind.ARRAY_LOAD),
- /** Load short from array */
+ /**
+ * Load {@link TypeKind#SHORT short} from array.
+ *
+ * @jvms 6.5.saload <em>saload</em>
+ * @see Kind#ARRAY_LOAD
+ */
SALOAD(RawBytecodeHelper.SALOAD, 1, Kind.ARRAY_LOAD),
- /** Store int into local variable */
+ /**
+ * Store {@link TypeKind#INT int} into local variable.
+ *
+ * @jvms 6.5.istore <em>istore</em>
+ * @see Kind#STORE
+ */
ISTORE(RawBytecodeHelper.ISTORE, 2, Kind.STORE),
- /** Store long into local variable */
+ /**
+ * Store {@link TypeKind#LONG long} into local variable.
+ *
+ * @jvms 6.5.lstore <em>lstore</em>
+ * @see Kind#STORE
+ */
LSTORE(RawBytecodeHelper.LSTORE, 2, Kind.STORE),
- /** Store float into local variable */
+ /**
+ * Store {@link TypeKind#FLOAT float} into local variable.
+ *
+ * @jvms 6.5.fstore <em>fstore</em>
+ * @see Kind#STORE
+ */
FSTORE(RawBytecodeHelper.FSTORE, 2, Kind.STORE),
- /** Store double into local variable */
+ /**
+ * Store {@link TypeKind#DOUBLE double} into local variable.
+ *
+ * @jvms 6.5.dstore <em>dstore</em>
+ * @see Kind#STORE
+ */
DSTORE(RawBytecodeHelper.DSTORE, 2, Kind.STORE),
- /** Store reference into local variable */
+ /**
+ * Store {@link TypeKind#REFERENCE reference} into local variable.
+ * Can also store the {@link TypeKind##returnAddress returnAddress} type.
+ *
+ * @jvms 6.5.astore <em>astore</em>
+ * @see Kind#STORE
+ */
ASTORE(RawBytecodeHelper.ASTORE, 2, Kind.STORE),
- /** Store int into local variable 0 */
+ /**
+ * Store {@link TypeKind#INT int} into local variable slot {@code 0}.
+ *
+ * @jvms 6.5.istore_n <em>istore_<n></em>
+ * @see Kind#STORE
+ */
ISTORE_0(RawBytecodeHelper.ISTORE_0, 1, Kind.STORE),
- /** Store int into local variable 1 */
+ /**
+ * Store {@link TypeKind#INT int} into local variable slot {@code 1}.
+ *
+ * @jvms 6.5.istore_n <em>istore_<n></em>
+ * @see Kind#STORE
+ */
ISTORE_1(RawBytecodeHelper.ISTORE_1, 1, Kind.STORE),
- /** Store int into local variable 2 */
+ /**
+ * Store {@link TypeKind#INT int} into local variable slot {@code 2}.
+ *
+ * @jvms 6.5.istore_n <em>istore_<n></em>
+ * @see Kind#STORE
+ */
ISTORE_2(RawBytecodeHelper.ISTORE_2, 1, Kind.STORE),
- /** Store int into local variable 3 */
+ /**
+ * Store {@link TypeKind#INT int} into local variable slot {@code 3}.
+ *
+ * @jvms 6.5.istore_n <em>istore_<n></em>
+ * @see Kind#STORE
+ */
ISTORE_3(RawBytecodeHelper.ISTORE_3, 1, Kind.STORE),
- /** Store long into local variable 0 */
+ /**
+ * Store {@link TypeKind#LONG long} into local variable slot {@code 0}.
+ *
+ * @jvms 6.5.lstore_n <em>lstore_<n></em>
+ * @see Kind#STORE
+ */
LSTORE_0(RawBytecodeHelper.LSTORE_0, 1, Kind.STORE),
- /** Store long into local variable 1 */
+ /**
+ * Store {@link TypeKind#LONG long} into local variable slot {@code 1}.
+ *
+ * @jvms 6.5.lstore_n <em>lstore_<n></em>
+ * @see Kind#STORE
+ */
LSTORE_1(RawBytecodeHelper.LSTORE_1, 1, Kind.STORE),
- /** Store long into local variable 2 */
+ /**
+ * Store {@link TypeKind#LONG long} into local variable slot {@code 2}.
+ *
+ * @jvms 6.5.lstore_n <em>lstore_<n></em>
+ * @see Kind#STORE
+ */
LSTORE_2(RawBytecodeHelper.LSTORE_2, 1, Kind.STORE),
- /** Store long into local variable 3 */
+ /**
+ * Store {@link TypeKind#LONG long} into local variable slot {@code 3}.
+ *
+ * @jvms 6.5.lstore_n <em>lstore_<n></em>
+ * @see Kind#STORE
+ */
LSTORE_3(RawBytecodeHelper.LSTORE_3, 1, Kind.STORE),
- /** Store float into local variable 0 */
+ /**
+ * Store {@link TypeKind#FLOAT float} into local variable slot {@code 0}.
+ *
+ * @jvms 6.5.fstore_n <em>fstore_<n></em>
+ * @see Kind#STORE
+ */
FSTORE_0(RawBytecodeHelper.FSTORE_0, 1, Kind.STORE),
- /** Store float into local variable 1 */
+ /**
+ * Store {@link TypeKind#FLOAT float} into local variable slot {@code 1}.
+ *
+ * @jvms 6.5.fstore_n <em>fstore_<n></em>
+ * @see Kind#STORE
+ */
FSTORE_1(RawBytecodeHelper.FSTORE_1, 1, Kind.STORE),
- /** Store float into local variable 2 */
+ /**
+ * Store {@link TypeKind#FLOAT float} into local variable slot {@code 2}.
+ *
+ * @jvms 6.5.fstore_n <em>fstore_<n></em>
+ * @see Kind#STORE
+ */
FSTORE_2(RawBytecodeHelper.FSTORE_2, 1, Kind.STORE),
- /** Store float into local variable 3 */
+ /**
+ * Store {@link TypeKind#FLOAT float} into local variable slot {@code 3}.
+ *
+ * @jvms 6.5.fstore_n <em>fstore_<n></em>
+ * @see Kind#STORE
+ */
FSTORE_3(RawBytecodeHelper.FSTORE_3, 1, Kind.STORE),
- /** Store double into local variable 0 */
+ /**
+ * Store {@link TypeKind#DOUBLE double} into local variable slot {@code 0}.
+ *
+ * @jvms 6.5.dstore_n <em>dstore_<n></em>
+ * @see Kind#STORE
+ */
DSTORE_0(RawBytecodeHelper.DSTORE_0, 1, Kind.STORE),
- /** Store double into local variable 1 */
+ /**
+ * Store {@link TypeKind#DOUBLE double} into local variable slot {@code 1}.
+ *
+ * @jvms 6.5.dstore_n <em>dstore_<n></em>
+ * @see Kind#STORE
+ */
DSTORE_1(RawBytecodeHelper.DSTORE_1, 1, Kind.STORE),
- /** Store double into local variable 2 */
+ /**
+ * Store {@link TypeKind#DOUBLE double} into local variable slot {@code 2}.
+ *
+ * @jvms 6.5.dstore_n <em>dstore_<n></em>
+ * @see Kind#STORE
+ */
DSTORE_2(RawBytecodeHelper.DSTORE_2, 1, Kind.STORE),
- /** Store double into local variable 3 */
+ /**
+ * Store {@link TypeKind#DOUBLE double} into local variable slot {@code 3}.
+ *
+ * @jvms 6.5.dstore_n <em>dstore_<n></em>
+ * @see Kind#STORE
+ */
DSTORE_3(RawBytecodeHelper.DSTORE_3, 1, Kind.STORE),
- /** Store reference into local variable 0 */
+ /**
+ * Store {@link TypeKind#REFERENCE reference} into local variable slot {@code 0}.
+ * Can also store the {@link TypeKind##returnAddress returnAddress} type.
+ *
+ * @jvms 6.5.astore_n <em>astore_<n></em>
+ * @see Kind#STORE
+ */
ASTORE_0(RawBytecodeHelper.ASTORE_0, 1, Kind.STORE),
- /** Store reference into local variable 1 */
+ /**
+ * Store {@link TypeKind#REFERENCE reference} into local variable slot {@code 1}.
+ * Can also store the {@link TypeKind##returnAddress returnAddress} type.
+ *
+ * @jvms 6.5.astore_n <em>astore_<n></em>
+ * @see Kind#STORE
+ */
ASTORE_1(RawBytecodeHelper.ASTORE_1, 1, Kind.STORE),
- /** Store reference into local variable 2 */
+ /**
+ * Store {@link TypeKind#REFERENCE reference} into local variable slot {@code 2}.
+ * Can also store the {@link TypeKind##returnAddress returnAddress} type.
+ *
+ * @jvms 6.5.astore_n <em>astore_<n></em>
+ * @see Kind#STORE
+ */
ASTORE_2(RawBytecodeHelper.ASTORE_2, 1, Kind.STORE),
- /** Store reference into local variable 3 */
+ /**
+ * Store {@link TypeKind#REFERENCE reference} into local variable slot {@code 3}.
+ * Can also store the {@link TypeKind##returnAddress returnAddress} type.
+ *
+ * @jvms 6.5.astore_n <em>astore_<n></em>
+ * @see Kind#STORE
+ */
ASTORE_3(RawBytecodeHelper.ASTORE_3, 1, Kind.STORE),
- /** Store into int array */
+ /**
+ * Store into {@link TypeKind#INT int} array.
+ *
+ * @jvms 6.5.iastore <em>iastore</em>
+ * @see Kind#ARRAY_STORE
+ */
IASTORE(RawBytecodeHelper.IASTORE, 1, Kind.ARRAY_STORE),
- /** Store into long array */
+ /**
+ * Store into {@link TypeKind#LONG long} array.
+ *
+ * @jvms 6.5.lastore <em>lastore</em>
+ * @see Kind#ARRAY_STORE
+ */
LASTORE(RawBytecodeHelper.LASTORE, 1, Kind.ARRAY_STORE),
- /** Store into float array */
+ /**
+ * Store into {@link TypeKind#FLOAT float} array.
+ *
+ * @jvms 6.5.fastore <em>fastore</em>
+ * @see Kind#ARRAY_STORE
+ */
FASTORE(RawBytecodeHelper.FASTORE, 1, Kind.ARRAY_STORE),
- /** Store into double array */
+ /**
+ * Store into {@link TypeKind#DOUBLE double} array.
+ *
+ * @jvms 6.5.dastore <em>dastore</em>
+ * @see Kind#ARRAY_STORE
+ */
DASTORE(RawBytecodeHelper.DASTORE, 1, Kind.ARRAY_STORE),
- /** Store into reference array */
+ /**
+ * Store into {@link TypeKind#REFERENCE reference} array.
+ *
+ * @jvms 6.5.aastore <em>aastore</em>
+ * @see Kind#ARRAY_STORE
+ */
AASTORE(RawBytecodeHelper.AASTORE, 1, Kind.ARRAY_STORE),
- /** Store into byte array */
+ /**
+ * Store into {@link TypeKind#BYTE byte} or {@link TypeKind#BOOLEAN boolean} array.
+ *
+ * @jvms 6.5.bastore <em>bastore</em>
+ * @see Kind#ARRAY_STORE
+ */
BASTORE(RawBytecodeHelper.BASTORE, 1, Kind.ARRAY_STORE),
- /** Store into char array */
+ /**
+ * Store into {@link TypeKind#CHAR char} array.
+ *
+ * @jvms 6.5.castore <em>castore</em>
+ * @see Kind#ARRAY_STORE
+ */
CASTORE(RawBytecodeHelper.CASTORE, 1, Kind.ARRAY_STORE),
- /** Store into short array */
+ /**
+ * Store into {@link TypeKind#SHORT short} array.
+ *
+ * @jvms 6.5.sastore <em>sastore</em>
+ * @see Kind#ARRAY_STORE
+ */
SASTORE(RawBytecodeHelper.SASTORE, 1, Kind.ARRAY_STORE),
- /** Pop the top operand stack value */
+ /**
+ * Pop the top operand stack value.
+ *
+ * @jvms 6.5.pop <em>pop</em>
+ * @see Kind#STACK
+ */
POP(RawBytecodeHelper.POP, 1, Kind.STACK),
- /** Pop the top one or two operand stack values */
+ /**
+ * Pop the top one or two operand stack values.
+ *
+ * @jvms 6.5.pop2 <em>pop2</em>
+ * @see Kind#STACK
+ */
POP2(RawBytecodeHelper.POP2, 1, Kind.STACK),
- /** Duplicate the top operand stack value */
+ /**
+ * Duplicate the top operand stack value.
+ *
+ * @jvms 6.5.dup <em>dup</em>
+ * @see Kind#STACK
+ */
DUP(RawBytecodeHelper.DUP, 1, Kind.STACK),
- /** Duplicate the top operand stack value and insert two values down */
+ /**
+ * Duplicate the top operand stack value and insert two values down.
+ *
+ * @jvms 6.5.dup_x1 <em>dup_x1</em>
+ * @see Kind#STACK
+ */
DUP_X1(RawBytecodeHelper.DUP_X1, 1, Kind.STACK),
- /** Duplicate the top operand stack value and insert two or three values down */
+ /**
+ * Duplicate the top operand stack value and insert two or three values down.
+ *
+ * @jvms 6.5.dup_x2 <em>dup_x2</em>
+ * @see Kind#STACK
+ */
DUP_X2(RawBytecodeHelper.DUP_X2, 1, Kind.STACK),
- /** Duplicate the top one or two operand stack values */
+ /**
+ * Duplicate the top one or two operand stack values.
+ *
+ * @jvms 6.5.dup2 <em>dup2</em>
+ * @see Kind#STACK
+ */
DUP2(RawBytecodeHelper.DUP2, 1, Kind.STACK),
- /** Duplicate the top one or two operand stack values and insert two or three values down */
+ /**
+ * Duplicate the top one or two operand stack values and insert two or three
+ * values down.
+ *
+ * @jvms 6.5.dup2_x1 <em>dup2_x1</em>
+ * @see Kind#STACK
+ */
DUP2_X1(RawBytecodeHelper.DUP2_X1, 1, Kind.STACK),
- /** Duplicate the top one or two operand stack values and insert two, three, or four values down */
+ /**
+ * Duplicate the top one or two operand stack values and insert two, three,
+ * or four values down.
+ *
+ * @jvms 6.5.dup2_x2 <em>dup2_x2</em>
+ * @see Kind#STACK
+ */
DUP2_X2(RawBytecodeHelper.DUP2_X2, 1, Kind.STACK),
- /** Swap the top two operand stack values */
+ /**
+ * Swap the top two operand stack values.
+ *
+ * @jvms 6.5.swap <em>swap</em>
+ * @see Kind#STACK
+ */
SWAP(RawBytecodeHelper.SWAP, 1, Kind.STACK),
- /** Add int */
+ /**
+ * Add {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.iadd <em>iadd</em>
+ * @see Kind#OPERATOR
+ */
IADD(RawBytecodeHelper.IADD, 1, Kind.OPERATOR),
- /** Add long */
+ /**
+ * Add {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.ladd <em>ladd</em>
+ * @see Kind#OPERATOR
+ */
LADD(RawBytecodeHelper.LADD, 1, Kind.OPERATOR),
- /** Add float */
+ /**
+ * Add {@link TypeKind#FLOAT float}.
+ *
+ * @jvms 6.5.fadd <em>fadd</em>
+ * @see Kind#OPERATOR
+ */
FADD(RawBytecodeHelper.FADD, 1, Kind.OPERATOR),
- /** Add double */
+ /**
+ * Add {@link TypeKind#DOUBLE double}.
+ *
+ * @jvms 6.5.dadd <em>dadd</em>
+ * @see Kind#OPERATOR
+ */
DADD(RawBytecodeHelper.DADD, 1, Kind.OPERATOR),
- /** Subtract int */
+ /**
+ * Subtract {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.isub <em>isub</em>
+ * @see Kind#OPERATOR
+ */
ISUB(RawBytecodeHelper.ISUB, 1, Kind.OPERATOR),
- /** Subtract long */
+ /**
+ * Subtract {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lsub <em>lsub</em>
+ * @see Kind#OPERATOR
+ */
LSUB(RawBytecodeHelper.LSUB, 1, Kind.OPERATOR),
- /** Subtract float */
+ /**
+ * Subtract {@link TypeKind#FLOAT float}.
+ *
+ * @jvms 6.5.fsub <em>fsub</em>
+ * @see Kind#OPERATOR
+ */
FSUB(RawBytecodeHelper.FSUB, 1, Kind.OPERATOR),
- /** Subtract double */
+ /**
+ * Subtract {@link TypeKind#DOUBLE double}.
+ *
+ * @jvms 6.5.dsub <em>dsub</em>
+ * @see Kind#OPERATOR
+ */
DSUB(RawBytecodeHelper.DSUB, 1, Kind.OPERATOR),
- /** Multiply int */
+ /**
+ * Multiply {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.imul <em>imul</em>
+ * @see Kind#OPERATOR
+ */
IMUL(RawBytecodeHelper.IMUL, 1, Kind.OPERATOR),
- /** Multiply long */
+ /**
+ * Multiply {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lmul <em>lmul</em>
+ * @see Kind#OPERATOR
+ */
LMUL(RawBytecodeHelper.LMUL, 1, Kind.OPERATOR),
- /** Multiply float */
+ /**
+ * Multiply {@link TypeKind#FLOAT float}.
+ *
+ * @jvms 6.5.fmul <em>fmul</em>
+ * @see Kind#OPERATOR
+ */
FMUL(RawBytecodeHelper.FMUL, 1, Kind.OPERATOR),
- /** Multiply double */
+ /**
+ * Multiply {@link TypeKind#DOUBLE double}.
+ *
+ * @jvms 6.5.dmul <em>dmul</em>
+ * @see Kind#OPERATOR
+ */
DMUL(RawBytecodeHelper.DMUL, 1, Kind.OPERATOR),
- /** Divide int */
+ /**
+ * Divide {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.idiv <em>idiv</em>
+ * @see Kind#OPERATOR
+ */
IDIV(RawBytecodeHelper.IDIV, 1, Kind.OPERATOR),
- /** Divide long */
+ /**
+ * Divide {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.ldiv <em>ldiv</em>
+ * @see Kind#OPERATOR
+ */
LDIV(RawBytecodeHelper.LDIV, 1, Kind.OPERATOR),
- /** Divide float */
+ /**
+ * Divide {@link TypeKind#FLOAT float}.
+ *
+ * @jvms 6.5.fdiv <em>fdiv</em>
+ * @see Kind#OPERATOR
+ */
FDIV(RawBytecodeHelper.FDIV, 1, Kind.OPERATOR),
- /** Divide double */
+ /**
+ * Divide {@link TypeKind#DOUBLE double}.
+ *
+ * @jvms 6.5.ddiv <em>ddiv</em>
+ * @see Kind#OPERATOR
+ */
DDIV(RawBytecodeHelper.DDIV, 1, Kind.OPERATOR),
- /** Remainder int */
+ /**
+ * Remainder {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.irem <em>irem</em>
+ * @see Kind#OPERATOR
+ */
IREM(RawBytecodeHelper.IREM, 1, Kind.OPERATOR),
- /** Remainder long */
+ /**
+ * Remainder {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lrem <em>lrem</em>
+ * @see Kind#OPERATOR
+ */
LREM(RawBytecodeHelper.LREM, 1, Kind.OPERATOR),
- /** Remainder float */
+ /**
+ * Remainder {@link TypeKind#FLOAT float}.
+ *
+ * @jvms 6.5.frem <em>frem</em>
+ * @see Kind#OPERATOR
+ */
FREM(RawBytecodeHelper.FREM, 1, Kind.OPERATOR),
- /** Remainder double */
+ /**
+ * Remainder {@link TypeKind#DOUBLE double}.
+ *
+ * @jvms 6.5.drem <em>drem</em>
+ * @see Kind#OPERATOR
+ */
DREM(RawBytecodeHelper.DREM, 1, Kind.OPERATOR),
- /** Negate int */
+ /**
+ * Negate {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.ineg <em>ineg</em>
+ * @see Kind#OPERATOR
+ */
INEG(RawBytecodeHelper.INEG, 1, Kind.OPERATOR),
- /** Negate long */
+ /**
+ * Negate {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lneg <em>lneg</em>
+ * @see Kind#OPERATOR
+ */
LNEG(RawBytecodeHelper.LNEG, 1, Kind.OPERATOR),
- /** Negate float */
+ /**
+ * Negate {@link TypeKind#FLOAT float}.
+ *
+ * @jvms 6.5.fneg <em>fneg</em>
+ * @see Kind#OPERATOR
+ */
FNEG(RawBytecodeHelper.FNEG, 1, Kind.OPERATOR),
- /** Negate double */
+ /**
+ * Negate {@link TypeKind#DOUBLE double}.
+ *
+ * @jvms 6.5.dneg <em>dneg</em>
+ * @see Kind#OPERATOR
+ */
DNEG(RawBytecodeHelper.DNEG, 1, Kind.OPERATOR),
- /** Shift left int */
+ /**
+ * Shift left {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.ishl <em>ishl</em>
+ * @see Kind#OPERATOR
+ */
ISHL(RawBytecodeHelper.ISHL, 1, Kind.OPERATOR),
- /** Shift left long */
+ /**
+ * Shift left {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lshl <em>lshl</em>
+ * @see Kind#OPERATOR
+ */
LSHL(RawBytecodeHelper.LSHL, 1, Kind.OPERATOR),
- /** Shift right int */
+ /**
+ * Arithmetic shift right {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.ishr <em>ishr</em>
+ * @see Kind#OPERATOR
+ */
ISHR(RawBytecodeHelper.ISHR, 1, Kind.OPERATOR),
- /** Shift right long */
+ /**
+ * Arithmetic shift right {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lshr <em>lshr</em>
+ * @see Kind#OPERATOR
+ */
LSHR(RawBytecodeHelper.LSHR, 1, Kind.OPERATOR),
- /** Logical shift right int */
+ /**
+ * Logical shift right {@link TypeKind#INT int}.
+ *
+ * @jvms 6.5.iushr <em>iushr</em>
+ * @see Kind#OPERATOR
+ */
IUSHR(RawBytecodeHelper.IUSHR, 1, Kind.OPERATOR),
- /** Logical shift right long */
+ /**
+ * Logical shift right {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lushr <em>lushr</em>
+ * @see Kind#OPERATOR
+ */
LUSHR(RawBytecodeHelper.LUSHR, 1, Kind.OPERATOR),
- /** Boolean AND int */
+ /**
+ * Bitwise AND {@link TypeKind#INT int}.
+ *
+ * @apiNote
+ * This may be used to implement {@link TypeKind#BOOLEAN boolean} AND.
+ *
+ * @jvms 6.5.iand <em>iand</em>
+ * @see Kind#OPERATOR
+ */
IAND(RawBytecodeHelper.IAND, 1, Kind.OPERATOR),
- /** Boolean AND long */
+ /**
+ * Bitwise AND {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.land <em>land</em>
+ * @see Kind#OPERATOR
+ */
LAND(RawBytecodeHelper.LAND, 1, Kind.OPERATOR),
- /** Boolean OR int */
+ /**
+ * Bitwise OR {@link TypeKind#INT int}.
+ *
+ * @apiNote
+ * This may be used to implement {@link TypeKind#BOOLEAN boolean} OR.
+ *
+ * @jvms 6.5.ior <em>ior</em>
+ * @see Kind#OPERATOR
+ */
IOR(RawBytecodeHelper.IOR, 1, Kind.OPERATOR),
- /** Boolean OR long */
+ /**
+ * Bitwise OR {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lor <em>lor</em>
+ * @see Kind#OPERATOR
+ */
LOR(RawBytecodeHelper.LOR, 1, Kind.OPERATOR),
- /** Boolean XOR int */
+ /**
+ * Bitwise XOR {@link TypeKind#INT int}.
+ *
+ * @apiNote
+ * This may be used to implement {@link TypeKind#BOOLEAN boolean} XOR.
+ *
+ * @jvms 6.5.ixor <em>ixor</em>
+ * @see Kind#OPERATOR
+ */
IXOR(RawBytecodeHelper.IXOR, 1, Kind.OPERATOR),
- /** Boolean XOR long */
+ /**
+ * Bitwise XOR {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.lxor <em>lxor</em>
+ * @see Kind#OPERATOR
+ */
LXOR(RawBytecodeHelper.LXOR, 1, Kind.OPERATOR),
- /** Increment local variable by constant */
+ /**
+ * Increment local variable by constant.
+ *
+ * @jvms 6.5.iinc <em>iinc</em>
+ * @see Kind#INCREMENT
+ */
IINC(RawBytecodeHelper.IINC, 3, Kind.INCREMENT),
- /** Convert int to long */
+ /**
+ * Convert {@link TypeKind#INT int} to {@link TypeKind#LONG long}.
+ *
+ * @jls 5.1.2 Widening Primitive Conversion
+ * @jvms 6.5.i2l <em>i2l</em>
+ * @see Kind#CONVERT
+ */
I2L(RawBytecodeHelper.I2L, 1, Kind.CONVERT),
- /** Convert int to float */
+ /**
+ * Convert {@link TypeKind#INT int} to {@link TypeKind#FLOAT float}.
+ *
+ * @jls 5.1.2 Widening Primitive Conversion
+ * @jvms 6.5.i2f <em>i2f</em>
+ * @see Kind#CONVERT
+ */
I2F(RawBytecodeHelper.I2F, 1, Kind.CONVERT),
- /** Convert int to double */
+ /**
+ * Convert {@link TypeKind#INT int} to {@link TypeKind#DOUBLE double}.
+ *
+ * @jls 5.1.2 Widening Primitive Conversion
+ * @jvms 6.5.i2d <em>i2d</em>
+ * @see Kind#CONVERT
+ */
I2D(RawBytecodeHelper.I2D, 1, Kind.CONVERT),
- /** Convert long to int */
+ /**
+ * Convert {@link TypeKind#LONG long} to {@link TypeKind#INT int}.
+ *
+ * @jls 5.1.3 Narrowing Primitive Conversion
+ * @jvms 6.5.l2i <em>l2i</em>
+ * @see Kind#CONVERT
+ */
L2I(RawBytecodeHelper.L2I, 1, Kind.CONVERT),
- /** Convert long to float */
+ /** Convert {@link TypeKind#LONG long} to {@link TypeKind#FLOAT float}.
+ *
+ * @jls 5.1.2 Widening Primitive Conversion
+ * @jvms 6.5.l2f <em>l2f</em>
+ * @see Kind#CONVERT
+ */
L2F(RawBytecodeHelper.L2F, 1, Kind.CONVERT),
- /** Convert long to double */
+ /** Convert {@link TypeKind#LONG long} to {@link TypeKind#DOUBLE double}.
+ *
+ * @jls 5.1.2 Widening Primitive Conversion
+ * @jvms 6.5.l2d <em>l2d</em>
+ * @see Kind#CONVERT
+ */
L2D(RawBytecodeHelper.L2D, 1, Kind.CONVERT),
- /** Convert float to int */
+ /**
+ * Convert {@link TypeKind#FLOAT float} to {@link TypeKind#INT int}.
+ *
+ * @jls 5.1.3 Narrowing Primitive Conversion
+ * @jvms 6.5.f2i <em>f2i</em>
+ * @see Kind#CONVERT
+ */
F2I(RawBytecodeHelper.F2I, 1, Kind.CONVERT),
- /** Convert float to long */
+ /**
+ * Convert {@link TypeKind#FLOAT float} to {@link TypeKind#LONG long}.
+ *
+ * @jls 5.1.3 Narrowing Primitive Conversion
+ * @jvms 6.5.f2l <em>f2l</em>
+ * @see Kind#CONVERT
+ */
F2L(RawBytecodeHelper.F2L, 1, Kind.CONVERT),
- /** Convert float to double */
+ /**
+ * Convert {@link TypeKind#FLOAT float} to {@link TypeKind#DOUBLE double}.
+ *
+ * @jls 5.1.2 Widening Primitive Conversion
+ * @jvms 6.5.f2d <em>f2d</em>
+ * @see Kind#CONVERT
+ */
F2D(RawBytecodeHelper.F2D, 1, Kind.CONVERT),
- /** Convert double to int */
+ /**
+ * Convert {@link TypeKind#DOUBLE double} to {@link TypeKind#INT int}.
+ *
+ * @jls 5.1.3 Narrowing Primitive Conversion
+ * @jvms 6.5.d2i <em>d2i</em>
+ * @see Kind#CONVERT
+ */
D2I(RawBytecodeHelper.D2I, 1, Kind.CONVERT),
- /** Convert double to long */
+ /**
+ * Convert {@link TypeKind#DOUBLE double} to {@link TypeKind#LONG long}.
+ *
+ * @jvms 6.5.d2l <em>d2l</em>
+ * @see Kind#CONVERT
+ */
D2L(RawBytecodeHelper.D2L, 1, Kind.CONVERT),
- /** Convert double to float */
+ /**
+ * Convert {@link TypeKind#DOUBLE double} to {@link TypeKind#FLOAT float}.
+ *
+ * @jls 5.1.3 Narrowing Primitive Conversion
+ * @jvms 6.5.d2f <em>d2f</em>
+ * @see Kind#CONVERT
+ */
D2F(RawBytecodeHelper.D2F, 1, Kind.CONVERT),
- /** Convert int to byte */
+ /**
+ * Convert {@link TypeKind#INT int} to {@link TypeKind#BYTE byte}.
+ * This is as if storing the {@linkplain TypeKind##computational-type
+ * computational} {@code int} into a {@code byte} and loading it back.
+ *
+ * @jls 5.1.3 Narrowing Primitive Conversion
+ * @jvms 6.5.i2b <em>i2b</em>
+ * @see Kind#CONVERT
+ */
I2B(RawBytecodeHelper.I2B, 1, Kind.CONVERT),
- /** Convert int to char */
+ /**
+ * Convert {@link TypeKind#INT int} to {@link TypeKind#CHAR char}.
+ * This is as if storing the {@linkplain TypeKind##computational-type
+ * computational} {@code int} into a {@code char} and loading it back.
+ *
+ * @jls 5.1.3 Narrowing Primitive Conversion
+ * @jvms 6.5.i2c <em>i2c</em>
+ * @see Kind#CONVERT
+ */
I2C(RawBytecodeHelper.I2C, 1, Kind.CONVERT),
- /** Convert int to short */
+ /**
+ * Convert {@link TypeKind#INT int} to {@link TypeKind#SHORT short}.
+ * This is as if storing the {@linkplain TypeKind##computational-type
+ * computational} {@code int} into a {@code short} and loading it back.
+ *
+ * @jls 5.1.3 Narrowing Primitive Conversion
+ * @jvms 6.5.i2s <em>i2s</em>
+ * @see Kind#CONVERT
+ */
I2S(RawBytecodeHelper.I2S, 1, Kind.CONVERT),
- /** Compare long */
+ /**
+ * Compare {@link TypeKind#LONG long}.
+ *
+ * @see Long#compare(long, long)
+ * @jvms 6.5.lcmp <em>lcmp</em>
+ * @see Kind#OPERATOR
+ */
LCMP(RawBytecodeHelper.LCMP, 1, Kind.OPERATOR),
- /** Compare float */
+ /**
+ * Compare {@link TypeKind#FLOAT float}.
+ * Produces {@code -1} if any operand is {@link Float#isNaN(float) NaN}.
+ *
+ * @see Double##equivalenceRelation Floating-point Equality, Equivalence, and Comparison
+ * @jvms 6.5.fcmp_op <em>fcmp<op></em>
+ * @see Kind#OPERATOR
+ */
FCMPL(RawBytecodeHelper.FCMPL, 1, Kind.OPERATOR),
- /** Compare float */
+ /**
+ * Compare {@link TypeKind#FLOAT float}.
+ * Produces {@code 1} if any operand is {@link Float#isNaN(float) NaN}.
+ *
+ * @see Double##equivalenceRelation Floating-point Equality, Equivalence, and Comparison
+ * @jvms 6.5.fcmp_op <em>fcmp<op></em>
+ * @see Kind#OPERATOR
+ */
FCMPG(RawBytecodeHelper.FCMPG, 1, Kind.OPERATOR),
- /** Compare double */
+ /**
+ * Compare {@link TypeKind#DOUBLE double}.
+ * Produces {@code -1} if any operand is {@link Double#isNaN(double) NaN}.
+ *
+ * @see Double##equivalenceRelation Floating-point Equality, Equivalence, and Comparison
+ * @jvms 6.5.dcmp_op <em>dcmp<op></em>
+ * @see Kind#OPERATOR
+ */
DCMPL(RawBytecodeHelper.DCMPL, 1, Kind.OPERATOR),
- /** Compare double */
+ /**
+ * Compare {@link TypeKind#DOUBLE double}.
+ * Produces {@code 1} if any operand is {@link Double#isNaN(double) NaN}.
+ *
+ * @see Double##equivalenceRelation Floating-point Equality, Equivalence, and Comparison
+ * @jvms 6.5.dcmp_op <em>dcmp<op></em>
+ * @see Kind#OPERATOR
+ */
DCMPG(RawBytecodeHelper.DCMPG, 1, Kind.OPERATOR),
- /** Branch if int comparison with zero succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code == 0} succeeds.
+ *
+ * @jvms 6.5.if_cond <em>if_<cond></em>
+ * @see Kind#BRANCH
+ */
IFEQ(RawBytecodeHelper.IFEQ, 3, Kind.BRANCH),
- /** Branch if int comparison with zero succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code != 0} succeeds.
+ *
+ * @jvms 6.5.if_cond <em>if_<cond></em>
+ * @see Kind#BRANCH
+ */
IFNE(RawBytecodeHelper.IFNE, 3, Kind.BRANCH),
- /** Branch if int comparison with zero succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code < 0} succeeds.
+ *
+ * @jvms 6.5.if_cond <em>if_<cond></em>
+ * @see Kind#BRANCH
+ */
IFLT(RawBytecodeHelper.IFLT, 3, Kind.BRANCH),
- /** Branch if int comparison with zero succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code >= 0} succeeds.
+ *
+ * @jvms 6.5.if_cond <em>if_<cond></em>
+ * @see Kind#BRANCH
+ */
IFGE(RawBytecodeHelper.IFGE, 3, Kind.BRANCH),
- /** Branch if int comparison with zero succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code > 0} succeeds.
+ *
+ * @jvms 6.5.if_cond <em>if_<cond></em>
+ * @see Kind#BRANCH
+ */
IFGT(RawBytecodeHelper.IFGT, 3, Kind.BRANCH),
- /** Branch if int comparison with zero succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code <= 0} succeeds.
+ *
+ * @jvms 6.5.if_cond <em>if_<cond></em>
+ * @see Kind#BRANCH
+ */
IFLE(RawBytecodeHelper.IFLE, 3, Kind.BRANCH),
- /** Branch if int comparison succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code operand1 == operand2} succeeds.
+ *
+ * @jvms 6.5.if_icmp_cond <em>if_icmp<cond></em>
+ * @see Kind#BRANCH
+ */
IF_ICMPEQ(RawBytecodeHelper.IF_ICMPEQ, 3, Kind.BRANCH),
- /** Branch if int comparison succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code operand1 != operand2} succeeds.
+ *
+ * @jvms 6.5.if_icmp_cond <em>if_icmp<cond></em>
+ * @see Kind#BRANCH
+ */
IF_ICMPNE(RawBytecodeHelper.IF_ICMPNE, 3, Kind.BRANCH),
- /** Branch if int comparison succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code operand1 < operand2} succeeds.
+ *
+ * @jvms 6.5.if_icmp_cond <em>if_icmp<cond></em>
+ * @see Kind#BRANCH
+ */
IF_ICMPLT(RawBytecodeHelper.IF_ICMPLT, 3, Kind.BRANCH),
- /** Branch if int comparison succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code operand1 >= operand2} succeeds.
+ *
+ * @jvms 6.5.if_icmp_cond <em>if_icmp<cond></em>
+ * @see Kind#BRANCH
+ */
IF_ICMPGE(RawBytecodeHelper.IF_ICMPGE, 3, Kind.BRANCH),
- /** Branch if int comparison succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code operand1 > operand2} succeeds.
+ *
+ * @jvms 6.5.if_icmp_cond <em>if_icmp<cond></em>
+ * @see Kind#BRANCH
+ */
IF_ICMPGT(RawBytecodeHelper.IF_ICMPGT, 3, Kind.BRANCH),
- /** Branch if int comparison succeeds */
+ /**
+ * Branch if {@link TypeKind#INT int} comparison {@code operand1 <= operand2} succeeds.
+ *
+ * @jvms 6.5.if_icmp_cond <em>if_icmp<cond></em>
+ * @see Kind#BRANCH
+ */
IF_ICMPLE(RawBytecodeHelper.IF_ICMPLE, 3, Kind.BRANCH),
- /** Branch if reference comparison succeeds */
+ /**
+ * Branch if {@link TypeKind#REFERENCE reference} comparison
+ * {@code operand1 == operand2} succeeds.
+ *
+ * @jvms 6.5.if_acmp_cond <em>if_acmp<cond></em>
+ * @see Kind#BRANCH
+ */
IF_ACMPEQ(RawBytecodeHelper.IF_ACMPEQ, 3, Kind.BRANCH),
- /** Branch if reference comparison succeeds */
+ /**
+ * Branch if {@link TypeKind#REFERENCE reference} comparison
+ * {@code operand1 != operand2} succeeds.
+ *
+ * @jvms 6.5.if_acmp_cond <em>if_acmp<cond></em>
+ * @see Kind#BRANCH
+ */
IF_ACMPNE(RawBytecodeHelper.IF_ACMPNE, 3, Kind.BRANCH),
- /** Branch always */
+ /**
+ * Branch always.
+ *
+ * @jvms 6.5.goto <em>goto</em>
+ * @see Kind#BRANCH
+ */
GOTO(RawBytecodeHelper.GOTO, 3, Kind.BRANCH),
/**
- * Jump subroutine is discontinued opcode
- * @see java.lang.classfile.instruction.DiscontinuedInstruction
+ * (Discontinued) Jump subroutine; last used in major version {@value
+ * ClassFile#JAVA_6_VERSION}.
+ *
+ * @jvms 4.9.1 Static Constraints
+ * @jvms 6.5.jsr <em>jsr</em>
+ * @see Kind#DISCONTINUED_JSR
*/
JSR(RawBytecodeHelper.JSR, 3, Kind.DISCONTINUED_JSR),
/**
- * Return from subroutine is discontinued opcode
- * @see java.lang.classfile.instruction.DiscontinuedInstruction
+ * (Discontinued) Return from subroutine; last used in major version
+ * {@value ClassFile#JAVA_6_VERSION}.
+ *
+ * @jvms 4.9.1 Static Constraints
+ * @jvms 6.5.ret <em>ret</em>
+ * @see Kind#DISCONTINUED_RET
*/
RET(RawBytecodeHelper.RET, 2, Kind.DISCONTINUED_RET),
- /** Access jump table by index and jump */
+ /**
+ * Access jump table by index and jump.
+ *
+ * @jvms 6.5.tableswitch <em>tableswitch</em>
+ * @see Kind#TABLE_SWITCH
+ */
TABLESWITCH(RawBytecodeHelper.TABLESWITCH, -1, Kind.TABLE_SWITCH),
- /** Access jump table by key match and jump */
+ /**
+ * Access jump table by key match and jump.
+ *
+ * @jvms 6.5.lookupswitch <em>lookupswitch</em>
+ * @see Kind#LOOKUP_SWITCH
+ */
LOOKUPSWITCH(RawBytecodeHelper.LOOKUPSWITCH, -1, Kind.LOOKUP_SWITCH),
- /** Return int from method */
+ /**
+ * Return {@link TypeKind#INT int} from method.
+ *
+ * @jvms 6.5.ireturn <em>ireturn</em>
+ * @see Kind#RETURN
+ */
IRETURN(RawBytecodeHelper.IRETURN, 1, Kind.RETURN),
- /** Return long from method */
+ /**
+ * Return {@link TypeKind#LONG long} from method.
+ *
+ * @jvms 6.5.lreturn <em>lreturn</em>
+ * @see Kind#RETURN
+ */
LRETURN(RawBytecodeHelper.LRETURN, 1, Kind.RETURN),
- /** Return float from method */
+ /**
+ * Return {@link TypeKind#FLOAT float} from method.
+ *
+ * @jvms 6.5.freturn <em>freturn</em>
+ * @see Kind#RETURN
+ */
FRETURN(RawBytecodeHelper.FRETURN, 1, Kind.RETURN),
- /** Return double from method */
+ /**
+ * Return {@link TypeKind#DOUBLE double} from method.
+ *
+ * @jvms 6.5.dreturn <em>dreturn</em>
+ * @see Kind#RETURN
+ */
DRETURN(RawBytecodeHelper.DRETURN, 1, Kind.RETURN),
- /** Return reference from method */
+ /**
+ * Return {@link TypeKind#REFERENCE reference} from method.
+ *
+ * @jvms 6.5.areturn <em>areturn</em>
+ * @see Kind#RETURN
+ */
ARETURN(RawBytecodeHelper.ARETURN, 1, Kind.RETURN),
- /** Return void from method */
+ /**
+ * Return {@link TypeKind#VOID void} from method.
+ *
+ * @jvms 6.5.return <em>return</em>
+ * @see Kind#RETURN
+ */
RETURN(RawBytecodeHelper.RETURN, 1, Kind.RETURN),
- /** Get static field from class */
+ /**
+ * Get {@code static} field from class.
+ *
+ * @jvms 6.5.getstatic <em>getstatic</em>
+ * @see Kind#FIELD_ACCESS
+ */
GETSTATIC(RawBytecodeHelper.GETSTATIC, 3, Kind.FIELD_ACCESS),
- /** Set static field in class */
+ /**
+ * Set {@code static} field in class.
+ *
+ * @jvms 6.5.putstatic <em>putstatic</em>
+ * @see Kind#FIELD_ACCESS
+ */
PUTSTATIC(RawBytecodeHelper.PUTSTATIC, 3, Kind.FIELD_ACCESS),
- /** Fetch field from object */
+ /**
+ * Fetch field from object.
+ *
+ * @jvms 6.5.getfield <em>getfield</em>
+ * @see Kind#FIELD_ACCESS
+ */
GETFIELD(RawBytecodeHelper.GETFIELD, 3, Kind.FIELD_ACCESS),
- /** Set field in object */
+ /**
+ * Set field in object.
+ *
+ * @jvms 6.5.putfield <em>putfield</em>
+ * @see Kind#FIELD_ACCESS
+ */
PUTFIELD(RawBytecodeHelper.PUTFIELD, 3, Kind.FIELD_ACCESS),
- /** Invoke instance method; dispatch based on class */
+ /**
+ * Invoke instance method; dispatch based on class.
+ *
+ * @jvms 6.5.invokevirtual <em>invokevirtual</em>
+ * @see Kind#INVOKE
+ */
INVOKEVIRTUAL(RawBytecodeHelper.INVOKEVIRTUAL, 3, Kind.INVOKE),
/**
* Invoke instance method; direct invocation of instance initialization
- * methods and methods of the current class and its supertypes
+ * methods and methods of the current class and its supertypes.
+ *
+ * @jvms 6.5.invokevirtual <em>invokevirtual</em>
+ * @see Kind#INVOKE
*/
INVOKESPECIAL(RawBytecodeHelper.INVOKESPECIAL, 3, Kind.INVOKE),
- /** Invoke a class (static) method */
+ /**
+ * Invoke a class ({@code static}) method.
+ *
+ * @jvms 6.5.invokestatic <em>invokestatic</em>
+ * @see Kind#INVOKE
+ */
INVOKESTATIC(RawBytecodeHelper.INVOKESTATIC, 3, Kind.INVOKE),
- /** Invoke interface method */
+ /**
+ * Invoke interface method.
+ *
+ * @jvms 6.5.invokeinterface <em>invokeinterface</em>
+ * @see Kind#INVOKE
+ */
INVOKEINTERFACE(RawBytecodeHelper.INVOKEINTERFACE, 5, Kind.INVOKE),
- /** Invoke a dynamically-computed call site */
+ /**
+ * Invoke a dynamically-computed call site.
+ *
+ * @jvms 6.5.invokedynamic <em>invokedynamic</em>
+ * @see Kind#INVOKE_DYNAMIC
+ */
INVOKEDYNAMIC(RawBytecodeHelper.INVOKEDYNAMIC, 5, Kind.INVOKE_DYNAMIC),
- /** Create new object */
+ /**
+ * Create new object.
+ *
+ * @jvms 6.5.new <em>new</em>
+ * @see Kind#NEW_OBJECT
+ */
NEW(RawBytecodeHelper.NEW, 3, Kind.NEW_OBJECT),
- /** Create new array */
+ /**
+ * Create new array.
+ *
+ * @jvms 6.5.newarray <em>newarray</em>
+ * @see Kind#NEW_PRIMITIVE_ARRAY
+ */
NEWARRAY(RawBytecodeHelper.NEWARRAY, 2, Kind.NEW_PRIMITIVE_ARRAY),
- /** Create new array of reference */
+ /**
+ * Create new array of {@link TypeKind#REFERENCE reference}.
+ *
+ * @jvms 6.5.anewarray <em>anewarray</em>
+ * @see Kind#NEW_REF_ARRAY
+ */
ANEWARRAY(RawBytecodeHelper.ANEWARRAY, 3, Kind.NEW_REF_ARRAY),
- /** Get length of array */
+ /**
+ * Get length of array.
+ *
+ * @jvms 6.5.arraylength <em>arraylength</em>
+ * @see Kind#OPERATOR
+ */
ARRAYLENGTH(RawBytecodeHelper.ARRAYLENGTH, 1, Kind.OPERATOR),
- /** Throw exception or error */
+ /**
+ * Throw exception or error.
+ *
+ * @jvms 6.5.athrow <em>athrow</em>
+ * @see Kind#THROW_EXCEPTION
+ */
ATHROW(RawBytecodeHelper.ATHROW, 1, Kind.THROW_EXCEPTION),
- /** Check whether object is of given type */
+ /**
+ * Check whether object is of given type.
+ *
+ * @see Class#cast(Object)
+ * @jvms 6.5.checkcast <em>checkcast</em>
+ * @see Kind#TYPE_CHECK
+ */
CHECKCAST(RawBytecodeHelper.CHECKCAST, 3, Kind.TYPE_CHECK),
- /** Determine if object is of given type */
+ /**
+ * Determine if object is of given type.
+ *
+ * @see Class#isInstance(Object)
+ * @jvms 6.5.instanceof <em>instanceof</em>
+ * @see Kind#TYPE_CHECK
+ */
INSTANCEOF(RawBytecodeHelper.INSTANCEOF, 3, Kind.TYPE_CHECK),
- /** Enter monitor for object */
+ /**
+ * Enter monitor for object.
+ *
+ * @jvms 6.5.monitorenter <em>monitorenter</em>
+ * @see Kind#MONITOR
+ */
MONITORENTER(RawBytecodeHelper.MONITORENTER, 1, Kind.MONITOR),
- /** Exit monitor for object */
+ /**
+ * Exit monitor for object.
+ *
+ * @jvms 6.5.monitorexit <em>monitorexit</em>
+ * @see Kind#MONITOR
+ */
MONITOREXIT(RawBytecodeHelper.MONITOREXIT, 1, Kind.MONITOR),
- /** Create new multidimensional array */
+ /**
+ * Create new multidimensional array.
+ *
+ * @jvms 6.5.multianewarray <em>multianewarray</em>
+ * @see Kind#NEW_MULTI_ARRAY
+ */
MULTIANEWARRAY(RawBytecodeHelper.MULTIANEWARRAY, 4, Kind.NEW_MULTI_ARRAY),
- /** Branch if reference is null */
+ /**
+ * Branch if {@link TypeKind#REFERENCE reference} is {@code null}.
+ *
+ * @jvms 6.5.ifnull <em>ifnull</em>
+ * @see Kind#BRANCH
+ */
IFNULL(RawBytecodeHelper.IFNULL, 3, Kind.BRANCH),
- /** Branch if reference not null */
+ /**
+ * Branch if {@link TypeKind#REFERENCE reference} is not {@code null}.
+ *
+ * @jvms 6.5.ifnonnull <em>ifnonnull</em>
+ * @see Kind#BRANCH
+ */
IFNONNULL(RawBytecodeHelper.IFNONNULL, 3, Kind.BRANCH),
- /** Branch always (wide index) */
+ /**
+ * Branch always (wide index).
+ *
+ * @jvms 6.5.goto_w <em>goto_w</em>
+ * @see Kind#BRANCH
+ */
GOTO_W(RawBytecodeHelper.GOTO_W, 5, Kind.BRANCH),
/**
- * Jump subroutine (wide index) is discontinued opcode
- * @see java.lang.classfile.instruction.DiscontinuedInstruction
+ * (Discontinued) Jump subroutine (wide index); last used in major
+ * version {@value ClassFile#JAVA_6_VERSION}.
+ *
+ * @jvms 4.9.1 Static Constraints
+ * @jvms 6.5.jsr_w <em>jsr_w</em>
+ * @see Kind#DISCONTINUED_JSR
*/
JSR_W(RawBytecodeHelper.JSR_W, 5, Kind.DISCONTINUED_JSR),
- /** Load int from local variable (wide index) */
+ /**
+ * Load {@link TypeKind#INT int} from local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.iload <em>iload</em>
+ * @see Kind#LOAD
+ */
ILOAD_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.ILOAD, 4, Kind.LOAD),
- /** Load long from local variable (wide index) */
+ /**
+ * Load {@link TypeKind#LONG long} from local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.lload <em>lload</em>
+ * @see Kind#LOAD
+ */
LLOAD_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.LLOAD, 4, Kind.LOAD),
- /** Load float from local variable (wide index) */
+ /**
+ * Load {@link TypeKind#FLOAT float} from local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.fload <em>fload</em>
+ * @see Kind#LOAD
+ */
FLOAD_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.FLOAD, 4, Kind.LOAD),
- /** Load double from local variable (wide index) */
+ /**
+ * Load {@link TypeKind#DOUBLE double} from local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.dload <em>dload</em>
+ * @see Kind#LOAD
+ */
DLOAD_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.DLOAD, 4, Kind.LOAD),
- /** Load reference from local variable (wide index) */
+ /**
+ * Load {@link TypeKind#REFERENCE reference} from local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.aload <em>aload</em>
+ * @see Kind#LOAD
+ */
ALOAD_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.ALOAD, 4, Kind.LOAD),
- /** Store int into local variable (wide index) */
+ /**
+ * Store {@link TypeKind#INT int} into local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.istore <em>istore</em>
+ * @see Kind#STORE
+ */
ISTORE_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.ISTORE, 4, Kind.STORE),
- /** Store long into local variable (wide index) */
+ /**
+ * Store {@link TypeKind#LONG long} into local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.lstore <em>lstore</em>
+ * @see Kind#STORE
+ */
LSTORE_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.LSTORE, 4, Kind.STORE),
- /** Store float into local variable (wide index) */
+ /**
+ * Store {@link TypeKind#FLOAT float} into local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.fstore <em>fstore</em>
+ * @see Kind#STORE
+ */
FSTORE_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.FSTORE, 4, Kind.STORE),
- /** Store double into local variable (wide index) */
+ /**
+ * Store {@link TypeKind#DOUBLE double} into local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.dstore <em>dstore</em>
+ * @see Kind#STORE
+ */
DSTORE_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.DSTORE, 4, Kind.STORE),
- /** Store reference into local variable (wide index) */
+ /**
+ * Store {@link TypeKind#REFERENCE reference} into local variable (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ * Can also store the {@link TypeKind##returnAddress returnAddress} type.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.astore <em>astore</em>
+ * @see Kind#STORE
+ */
ASTORE_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.ASTORE, 4, Kind.STORE),
/**
- * Return from subroutine (wide index) is discontinued opcode
- * @see java.lang.classfile.instruction.DiscontinuedInstruction
+ * (Discontinued) Return from subroutine (wide index); last used in major
+ * version {@value ClassFile#JAVA_6_VERSION}.
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 4.9.1 Static Constraints
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.ret <em>ret</em>
+ * @see Kind#DISCONTINUED_RET
*/
RET_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.RET, 4, Kind.DISCONTINUED_RET),
- /** Increment local variable by constant (wide index) */
+ /**
+ * Increment local variable by constant (wide index).
+ * This is a {@linkplain #isWide() wide}-modified pseudo-opcode.
+ *
+ * @jvms 6.5.wide <em>wide</em>
+ * @jvms 6.5.iinc <em>iinc</em>
+ * @see Kind#INCREMENT
+ */
IINC_W((RawBytecodeHelper.WIDE << 8) | RawBytecodeHelper.IINC, 6, Kind.INCREMENT);
/**
- * Kinds of opcodes.
+ * Kinds of opcodes. Each kind of opcode has its own modeling interface
+ * for its instructions.
*
* @since 24
*/
- public static enum Kind {
+ public enum Kind {
/**
- * Load from local variable
+ * Load from local variable.
*
+ * @see LoadInstruction
* @see Opcode#ILOAD
* @see Opcode#LLOAD
* @see Opcode#FLOAD
@@ -736,8 +1901,9 @@ public static enum Kind {
LOAD,
/**
- * Store into local variable
+ * Store into local variable.
*
+ * @see StoreInstruction
* @see Opcode#ISTORE
* @see Opcode#LSTORE
* @see Opcode#FSTORE
@@ -772,16 +1938,18 @@ public static enum Kind {
STORE,
/**
- * Increment local variable
+ * Increment local variable.
*
+ * @see IncrementInstruction
* @see Opcode#IINC
* @see Opcode#IINC_W
*/
INCREMENT,
/**
- * Branch
+ * Branch.
*
+ * @see BranchInstruction
* @see Opcode#IFEQ
* @see Opcode#IFNE
* @see Opcode#IFLT
@@ -804,22 +1972,25 @@ public static enum Kind {
BRANCH,
/**
- * Access jump table by key match and jump
+ * Access jump table by key match and jump.
*
+ * @see LookupSwitchInstruction
* @see Opcode#LOOKUPSWITCH
*/
LOOKUP_SWITCH,
/**
- * Access jump table by index and jump
+ * Access jump table by index and jump.
*
+ * @see TableSwitchInstruction
* @see Opcode#TABLESWITCH
*/
TABLE_SWITCH,
/**
- * Return from method
+ * Return from method.
*
+ * @see ReturnInstruction
* @see Opcode#IRETURN
* @see Opcode#LRETURN
* @see Opcode#FRETURN
@@ -830,15 +2001,17 @@ public static enum Kind {
RETURN,
/**
- * Throw exception or error
+ * Throw exception or error.
*
+ * @see ThrowInstruction
* @see Opcode#ATHROW
*/
THROW_EXCEPTION,
/**
- * Access field
+ * Access field.
*
+ * @see FieldInstruction
* @see Opcode#GETSTATIC
* @see Opcode#PUTSTATIC
* @see Opcode#GETFIELD
@@ -847,8 +2020,9 @@ public static enum Kind {
FIELD_ACCESS,
/**
- * Invoke method or constructor
+ * Invoke method or constructor.
*
+ * @see InvokeInstruction
* @see Opcode#INVOKEVIRTUAL
* @see Opcode#INVOKESPECIAL
* @see Opcode#INVOKESTATIC
@@ -857,51 +2031,58 @@ public static enum Kind {
INVOKE,
/**
- * Invoke a dynamically-computed call site
+ * Invoke a dynamically-computed call site.
*
+ * @see InvokeDynamicInstruction
* @see Opcode#INVOKEDYNAMIC
*/
INVOKE_DYNAMIC,
/**
- * Create new object
+ * Create new object.
*
+ * @see NewObjectInstruction
* @see Opcode#NEW
*/
NEW_OBJECT,
/**
- * Create new array
+ * Create new array.
*
+ * @see NewPrimitiveArrayInstruction
* @see Opcode#NEWARRAY
*/
NEW_PRIMITIVE_ARRAY,
/**
- * Create new reference array
+ * Create new {@link TypeKind#REFERENCE reference} array.
*
+ * @see NewReferenceArrayInstruction
* @see Opcode#ANEWARRAY
*/
NEW_REF_ARRAY,
/**
- * Create new multidimensional array
+ * Create new multidimensional array.
*
+ * @see NewMultiArrayInstruction
* @see Opcode#MULTIANEWARRAY
*/
NEW_MULTI_ARRAY,
/**
- * Check whether object is of given type
+ * Check whether object is of given type.
*
+ * @see TypeCheckInstruction
* @see Opcode#CHECKCAST
* @see Opcode#INSTANCEOF
*/
TYPE_CHECK,
/**
- * Load from array
+ * Load from array.
*
+ * @see ArrayLoadInstruction
* @see Opcode#IALOAD
* @see Opcode#LALOAD
* @see Opcode#FALOAD
@@ -914,8 +2095,9 @@ public static enum Kind {
ARRAY_LOAD,
/**
- * Store into array
+ * Store into array.
*
+ * @see ArrayStoreInstruction
* @see Opcode#IASTORE
* @see Opcode#LASTORE
* @see Opcode#FASTORE
@@ -928,8 +2110,9 @@ public static enum Kind {
ARRAY_STORE,
/**
- * Stack operations
+ * Stack operations.
*
+ * @see StackInstruction
* @see Opcode#POP
* @see Opcode#POP2
* @see Opcode#DUP
@@ -943,8 +2126,9 @@ public static enum Kind {
STACK,
/**
- * Type conversions
+ * Type conversions.
*
+ * @see ConvertInstruction
* @see Opcode#I2L
* @see Opcode#I2F
* @see Opcode#I2D
@@ -964,8 +2148,9 @@ public static enum Kind {
CONVERT,
/**
- * Operators
+ * Operators.
*
+ * @see OperatorInstruction
* @see Opcode#IADD
* @see Opcode#LADD
* @see Opcode#FADD
@@ -1012,8 +2197,9 @@ public static enum Kind {
OPERATOR,
/**
- * Constants
+ * Constants.
*
+ * @see ConstantInstruction
* @see Opcode#ACONST_NULL
* @see Opcode#ICONST_M1
* @see Opcode#ICONST_0
@@ -1038,35 +2224,37 @@ public static enum Kind {
CONSTANT,
/**
- * Monitor
+ * Monitor.
*
+ * @see MonitorInstruction
* @see Opcode#MONITORENTER
* @see Opcode#MONITOREXIT
*/
MONITOR,
/**
- * Do nothing
+ * Do nothing.
*
+ * @see NopInstruction
* @see Opcode#NOP
*/
NOP,
/**
- * Discontinued jump subroutine
+ * Discontinued jump subroutine.
*
+ * @see DiscontinuedInstruction.JsrInstruction
* @see Opcode#JSR
* @see Opcode#JSR_W
- * @see java.lang.classfile.instruction.DiscontinuedInstruction
*/
DISCONTINUED_JSR,
/**
- * Discontinued return from subroutine
+ * Discontinued return from subroutine.
*
+ * @see DiscontinuedInstruction.RetInstruction
* @see Opcode#RET
* @see Opcode#RET_W
- * @see java.lang.classfile.instruction.DiscontinuedInstruction
*/
DISCONTINUED_RET;
}
@@ -1090,7 +2278,10 @@ public static enum Kind {
/**
* {@return true if this is a pseudo-opcode modified by wide opcode}
+ * <p>
+ * {@code wide} extends local variable index by additional bytes.
*
+ * @jvms 6.5.wide <em>wide</em>
* @see #ILOAD_W
* @see #LLOAD_W
* @see #FLOAD_W
@@ -1109,11 +2300,14 @@ public static enum Kind {
/**
* {@return size of the instruction in bytes if fixed, or -1 otherwise} This size includes
* the opcode itself.
+ *
+ * @see Instruction#sizeInBytes() Instruction::sizeInBytes
*/
public int sizeIfFixed() { return sizeIfFixed; }
/**
- * {@return instruction kind}
+ * {@return operation kind} Each kind of operation has its own modeling
+ * interface to model instructions belonging to that kind.
*/
public Kind kind() { return kind; }
}
diff --git a/src/java.base/share/classes/java/lang/classfile/TypeKind.java b/src/java.base/share/classes/java/lang/classfile/TypeKind.java
index 5a6475aa801..e3fc11858f5 100644
--- a/src/java.base/share/classes/java/lang/classfile/TypeKind.java
+++ b/src/java.base/share/classes/java/lang/classfile/TypeKind.java
@@ -26,6 +26,9 @@
package java.lang.classfile;
import java.lang.classfile.instruction.DiscontinuedInstruction;
+import java.lang.classfile.instruction.LoadInstruction;
+import java.lang.classfile.instruction.NewPrimitiveArrayInstruction;
+import java.lang.classfile.instruction.StoreInstruction;
import java.lang.constant.ClassDesc;
import java.lang.constant.ConstantDescs;
import java.lang.invoke.TypeDescriptor;
@@ -33,13 +36,17 @@
import jdk.internal.vm.annotation.Stable;
/**
- * Describes the data types Java Virtual Machine operates on.
- * This omits {@code returnAddress} (JVMS {@jvms 2.3.3}),
- * which is only used by discontinued {@link
- * DiscontinuedInstruction.JsrInstruction jsr} and {@link
- * DiscontinuedInstruction.RetInstruction ret} instructions,
- * and includes {@link #VOID void} (JVMS {@jvms 4.3.3}), which
- * appears as a method return type.
+ * Describes the data types Java Virtual Machine operates on. This omits {@code
+ * returnAddress} (JVMS {@jvms 2.3.3}) and includes {@link #VOID void} (JVMS
+ * {@jvms 4.3.3}), which appears as a method return type.
+ * <p>
+ * The <code>{@index returnAddress}</code> type is only used by discontinued
+ * {@linkplain DiscontinuedInstruction.JsrInstruction jump subroutine} and
+ * {@linkplain DiscontinuedInstruction.RetInstruction return from subroutine}
+ * instructions. Jump subroutine instructions push {@code returnAddress} to the
+ * operand stack; {@link StoreInstruction astore} instructions store {@code
+ * returnAddress} from the operand stack to local variables; return from
+ * subroutine instructions load {@code returnAddress} from local variables.
*
* <h2 id="computational-type">Computational Type</h2>
* In the {@code class} file format, local variables (JVMS {@jvms 2.6.1}),
@@ -164,7 +171,10 @@ private ClassDesc fetchUpperBound() {
/**
* {@return the code used by the {@link Opcode#NEWARRAY newarray} instruction to create an array
* of this component type, or {@code -1} if this type is not supported by {@code newarray}}
- * @jvms 6.5.newarray <i>newarray</i>
+ *
+ * @jvms 6.5.newarray <em>newarray</em>
+ * @see NewPrimitiveArrayInstruction
+ * @see #fromNewarrayCode(int) fromNewarrayCode(int)
*/
public int newarrayCode() {
return newarrayCode;
@@ -175,6 +185,7 @@ public int newarrayCode() {
* This is also the category of this type for instructions operating on the operand stack without
* regard to type (JVMS {@jvms 2.11.1}), such as {@link Opcode#POP pop} versus {@link Opcode#POP2
* pop2}.
+ *
* @jvms 2.6.1 Local Variables
* @jvms 2.6.2 Operand Stacks
*/
@@ -185,6 +196,9 @@ public int slotSize() {
/**
* {@return the {@linkplain ##computational-type computational type} for this type, or {@link #VOID void}
* for {@code void}}
+ *
+ * @see LoadInstruction
+ * @see StoreInstruction
*/
public TypeKind asLoadable() {
return ordinal() < 4 ? INT : this;
@@ -193,9 +207,12 @@ public TypeKind asLoadable() {
/**
* {@return the component type described by the array code used as an operand to {@link Opcode#NEWARRAY
* newarray}}
+ *
* @param newarrayCode the operand of the {@code newarray} instruction
* @throws IllegalArgumentException if the code is invalid
- * @jvms 6.5.newarray <i>newarray</i>
+ * @jvms 6.5.newarray <em>newarray</em>
+ * @see NewPrimitiveArrayInstruction
+ * @see #newarrayCode() newarrayCode()
*/
public static TypeKind fromNewarrayCode(int newarrayCode) {
return switch (newarrayCode) {
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ArrayLoadInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ArrayLoadInstruction.java
index cc0e0b89f80..49bb708403e 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ArrayLoadInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ArrayLoadInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -35,18 +36,29 @@
/**
* Models an array load instruction in the {@code code} array of a {@code Code}
- * attribute. Corresponding opcodes will have a {@code kind} of {@link
- * Opcode.Kind#ARRAY_LOAD}. Delivered as a {@link CodeElement} when
+ * attribute. Corresponding opcodes have a {@linkplain Opcode#kind() kind}
+ * of {@link Opcode.Kind#ARRAY_LOAD}. Delivered as a {@link CodeElement} when
* traversing the elements of a {@link CodeModel}.
+ * <p>
+ * An array load instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="ArrayLoadInstruction" target="CodeBuilder#arrayLoad(TypeKind)" :
+ * ArrayLoadInstruction(TypeKind typeKind) // @link substring="typeKind" target="#typeKind"
+ * }
+ * where {@code typeKind} is not {@link TypeKind#VOID void}, and {@link
+ * TypeKind#BOOLEAN boolean} is converted to {@link TypeKind#BYTE byte}.
*
+ * @see Opcode.Kind#ARRAY_LOAD
+ * @see CodeBuilder#arrayLoad CodeBuilder::arrayLoad
* @since 24
*/
public sealed interface ArrayLoadInstruction extends Instruction
permits AbstractInstruction.UnboundArrayLoadInstruction {
/**
- * {@return the component type of the array} The {@link TypeKind#BYTE byte}
+ * {@return the component type of the array} The {@link TypeKind#BYTE byte}
* type load instruction {@link Opcode#BALOAD baload} also operates on
- * {@link TypeKind#BOOLEAN boolean} arrays.
+ * {@link TypeKind#BOOLEAN boolean} arrays, so this never returns
+ * {@code boolean}.
*/
TypeKind typeKind();
@@ -56,7 +68,7 @@ public sealed interface ArrayLoadInstruction extends Instruction
* @param op the opcode for the specific type of array load instruction,
* which must be of kind {@link Opcode.Kind#ARRAY_LOAD}
* @throws IllegalArgumentException if the opcode kind is not
- * {@link Opcode.Kind#ARRAY_LOAD}.
+ * {@link Opcode.Kind#ARRAY_LOAD}
*/
static ArrayLoadInstruction of(Opcode op) {
Util.checkKind(op, Opcode.Kind.ARRAY_LOAD);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ArrayStoreInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ArrayStoreInstruction.java
index c350b3a5928..e5883a2cd2a 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ArrayStoreInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ArrayStoreInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -35,18 +36,29 @@
/**
* Models an array store instruction in the {@code code} array of a {@code Code}
- * attribute. Corresponding opcodes will have a {@code kind} of {@link
- * Opcode.Kind#ARRAY_STORE}. Delivered as a {@link CodeElement} when
+ * attribute. Corresponding opcodes have a {@linkplain Opcode#kind() kind}
+ * of {@link Opcode.Kind#ARRAY_STORE}. Delivered as a {@link CodeElement} when
* traversing the elements of a {@link CodeModel}.
+ * <p>
+ * An array store instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="ArrayStoreInstruction" target="CodeBuilder#arrayStore(TypeKind)" :
+ * ArrayStoreInstruction(TypeKind typeKind) // @link substring="typeKind" target="#typeKind"
+ * }
+ * where {@code typeKind} is not {@link TypeKind#VOID void}, and {@link
+ * TypeKind#BOOLEAN boolean} is converted to {@link TypeKind#BYTE byte}.
*
+ * @see Opcode.Kind#ARRAY_STORE
+ * @see CodeBuilder#arrayStore CodeBuilder::arrayStore
* @since 24
*/
public sealed interface ArrayStoreInstruction extends Instruction
permits AbstractInstruction.UnboundArrayStoreInstruction {
/**
- * {@return the component type of the array} The {@link TypeKind#BYTE byte}
+ * {@return the component type of the array} The {@link TypeKind#BYTE byte}
* type store instruction {@link Opcode#BASTORE bastore} also operates on
- * {@link TypeKind#BOOLEAN boolean} arrays.
+ * {@link TypeKind#BOOLEAN boolean} arrays, so this never returns
+ * {@code boolean}.
*/
TypeKind typeKind();
@@ -56,7 +68,7 @@ public sealed interface ArrayStoreInstruction extends Instruction
* @param op the opcode for the specific type of array store instruction,
* which must be of kind {@link Opcode.Kind#ARRAY_STORE}
* @throws IllegalArgumentException if the opcode kind is not
- * {@link Opcode.Kind#ARRAY_STORE}.
+ * {@link Opcode.Kind#ARRAY_STORE}
*/
static ArrayStoreInstruction of(Opcode op) {
Util.checkKind(op, Opcode.Kind.ARRAY_STORE);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/BranchInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/BranchInstruction.java
index 2fdc00fced1..a37e37980d4 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/BranchInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/BranchInstruction.java
@@ -24,28 +24,41 @@
*/
package java.lang.classfile.instruction;
-import java.lang.classfile.CodeElement;
-import java.lang.classfile.CodeModel;
-import java.lang.classfile.Instruction;
-import java.lang.classfile.Label;
-import java.lang.classfile.Opcode;
+import java.lang.classfile.*;
import jdk.internal.classfile.impl.AbstractInstruction;
import jdk.internal.classfile.impl.Util;
/**
* Models a branching instruction (conditional or unconditional) in the {@code
- * code} array of a {@code Code} attribute. Corresponding opcodes will have a
- * {@code kind} of {@link Opcode.Kind#BRANCH}. Delivered as a {@link
- * CodeElement} when traversing the elements of a {@link CodeModel}.
+ * code} array of a {@code Code} attribute. Corresponding opcodes have a
+ * {@linkplain Opcode#kind() kind} of {@link Opcode.Kind#BRANCH}. Delivered as
+ * a {@link CodeElement} when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A branch instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="BranchInstruction" target="#of":
+ * BranchInstruction(
+ * Opcode opcode, // @link substring="opcode" target="#opcode()"
+ * Label target // @link substring="target" target="#target()"
+ * )
+ * }
+ * <p>
+ * Due to physical restrictions, some types of instructions cannot encode labels
+ * too far away in the list of code elements. In such cases, the {@link
+ * ClassFile.ShortJumpsOption} controls how an invalid branch instruction model
+ * is written by a {@link CodeBuilder}.
*
+ * @see Opcode.Kind#BRANCH
+ * @see CodeBuilder#branch CodeBuilder::branch
+ * @see ClassFile.ShortJumpsOption
* @since 24
*/
public sealed interface BranchInstruction extends Instruction
permits AbstractInstruction.BoundBranchInstruction,
AbstractInstruction.UnboundBranchInstruction {
/**
- * {@return the target of the branch}
+ * {@return the branch target of this instruction}
*/
Label target();
@@ -56,7 +69,7 @@ public sealed interface BranchInstruction extends Instruction
* which must be of kind {@link Opcode.Kind#BRANCH}
* @param target the target of the branch
* @throws IllegalArgumentException if the opcode kind is not
- * {@link Opcode.Kind#BRANCH}.
+ * {@link Opcode.Kind#BRANCH}
*/
static BranchInstruction of(Opcode op, Label target) {
Util.checkKind(op, Opcode.Kind.BRANCH);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/CharacterRange.java b/src/java.base/share/classes/java/lang/classfile/instruction/CharacterRange.java
index d47639d7dd7..07d4c116b3a 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/CharacterRange.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/CharacterRange.java
@@ -25,6 +25,7 @@
package java.lang.classfile.instruction;
import java.lang.classfile.ClassFile;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Label;
@@ -36,11 +37,31 @@
import jdk.internal.classfile.impl.BoundCharacterRange;
/**
- * A pseudo-instruction which models a single entry in the
- * {@link CharacterRangeTableAttribute}. Delivered as a {@link CodeElement}
- * during traversal of the elements of a {@link CodeModel}, according to
- * the setting of the {@link ClassFile.DebugElementsOption} option.
+ * A pseudo-instruction which models a single entry in the {@link
+ * CharacterRangeTableAttribute CharacterRangeTable} attribute. Delivered as a
+ * {@link CodeElement} during traversal of the elements of a {@link CodeModel},
+ * according to the setting of the {@link ClassFile.DebugElementsOption} option.
+ * <p>
+ * A character range entry is composite:
+ * {@snippet lang=text :
+ * // @link substring="CharacterRange" target="#of":
+ * CharacterRange(
+ * Label startScope, // @link substring="startScope" target="#startScope"
+ * Label endScope, // @link substring="endScope" target="#endScope"
+ * int characterRangeStart, // @link substring="characterRangeStart" target="#characterRangeStart"
+ * int characterRangeEnd, // @link substring="characterRangeEnd" target="#characterRangeEnd"
+ * int flags // @link substring="flags" target="#flags"
+ * )
+ * }
+ * <p>
+ * Another model, {@link CharacterRangeInfo}, also models a character range
+ * entry; it has no dependency on a {@code CodeModel} and represents of bci
+ * values as {@code int}s instead of {@code Label}s, and is used as components
+ * of a {@link CharacterRangeTableAttribute}.
*
+ * @see CharacterRangeInfo
+ * @see CodeBuilder#characterRange CodeBuilder::characterRange
+ * @see ClassFile.DebugElementsOption
* @since 24
*/
public sealed interface CharacterRange extends PseudoInstruction
@@ -114,7 +135,7 @@ public sealed interface CharacterRange extends PseudoInstruction
* <li>{@link #FLAG_BRANCH_FALSE}
* </ul>
*
- * @see java.lang.classfile.attribute.CharacterRangeInfo#flags()
+ * @see CharacterRangeInfo#flags()
*
* @return the flags
*/
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ConstantInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ConstantInstruction.java
index 312c1868f19..f11a90c7d4c 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ConstantInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ConstantInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -38,12 +39,22 @@
/**
* Models a constant-load instruction in the {@code code} array of a {@code
- * Code} attribute, including "intrinsic constant" instructions (e.g., {@code
- * iconst_0}), "argument constant" instructions (e.g., {@code bipush}), and "load
- * constant" instructions (e.g., {@code LDC}). Corresponding opcodes will have
- * a {@code kind} of {@link Opcode.Kind#CONSTANT}. Delivered as a {@link
- * CodeElement} when traversing the elements of a {@link CodeModel}.
+ * Code} attribute, including {@linkplain IntrinsicConstantInstruction
+ * "intrinsic"}, {@linkplain ArgumentConstantInstruction "argument"}, and
+ * {@linkplain LoadConstantInstruction "load"} constant instructions.
+ * Corresponding opcodes have a {@linkplain Opcode#kind() kind} of {@link
+ * Opcode.Kind#CONSTANT}. Delivered as a {@link CodeElement} when traversing
+ * the elements of a {@link CodeModel}.
+ * <p>
+ * The loaded constant value is symbolically represented as a {@link ConstantDesc}:
+ * {@snippet lang=text :
+ * // @link substring="ConstantInstruction" target="CodeBuilder#loadConstant(ConstantDesc)" :
+ * ConstantInstruction(ConstantDesc constantValue) // @link substring="constantValue" target="#constantValue()"
+ * }
*
+ * @see Opcode.Kind#CONSTANT
+ * @see CodeBuilder#loadConstant(ConstantDesc) CodeBuilder::loadConstant
+ * @sealedGraph
* @since 24
*/
public sealed interface ConstantInstruction extends Instruction {
@@ -54,22 +65,36 @@ public sealed interface ConstantInstruction extends Instruction {
ConstantDesc constantValue();
/**
- * {@return the type of the constant}
+ * {@return the {@linkplain TypeKind##computational-type computational type} of the constant}
+ * This is derived from the {@link #constantValue() constantValue}.
*/
TypeKind typeKind();
/**
- * Models an "intrinsic constant" instruction (e.g., {@code
- * iconst_0}).
+ * Models an "intrinsic constant" instruction, which encodes
+ * the constant value in its opcode. Examples include {@link
+ * Opcode#ACONST_NULL aconst_null} and {@link
+ * Opcode#ICONST_0 iconst_0}.
+ * <p>
+ * An intrinsic constant instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="IntrinsicConstantInstruction" target="#ofIntrinsic" :
+ * IntrinsicConstantInstruction(Opcode opcode) // @link substring="opcode" target="#opcode()"
+ * }
+ * where:
+ * <dl>
+ * <dt>{@link #opcode() opcode}</dt>
+ * <dd>Must be of the constant kind and have a {@linkplain
+ * Opcode#sizeIfFixed() fixed size} of 1.</dd>
+ * </dl>
*
+ * @see Opcode.Kind#CONSTANT
+ * @see ConstantInstruction#ofIntrinsic ConstantInstruction::ofIntrinsic
* @since 24
*/
sealed interface IntrinsicConstantInstruction extends ConstantInstruction
permits AbstractInstruction.UnboundIntrinsicConstantInstruction {
- /**
- * {@return the type of the constant}
- */
@Override
default TypeKind typeKind() {
return BytecodeHelpers.intrinsicConstantType(opcode());
@@ -77,9 +102,31 @@ default TypeKind typeKind() {
}
/**
- * Models an "argument constant" instruction (e.g., {@code
- * bipush}).
+ * Models an "argument constant" instruction, which encodes the
+ * constant value in the instruction directly. Includes {@link
+ * Opcode#BIPUSH bipush} and {@link Opcode#SIPUSH sipush} instructions.
+ * <p>
+ * An argument constant instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="ArgumentConstantInstruction" target="#ofArgument" :
+ * ArgumentConstantInstruction(
+ * Opcode opcode, // @link substring="opcode" target="#opcode()"
+ * int constantValue // @link substring="constantValue" target="#constantValue()"
+ * )
+ * }
+ * where:
+ * <ul>
+ * <li>{@code opcode} must be one of {@code bipush} or {@code sipush}.
+ * <li>{@code constantValue} must be in the range of {@code byte}, {@code
+ * [-128, 127]}, for {@code bipush}, and in the range of {@code short},
+ * {@code [-32768, 32767]}, for {@code sipush}.
+ * </ul>
*
+ * @see Opcode.Kind#CONSTANT
+ * @see ConstantInstruction#ofArgument ConstantInstruction::ofArgument
+ * @see CodeBuilder#loadConstant(int) CodeBuilder::loadConstant(int)
+ * @see CodeBuilder#bipush CodeBuilder::bipush
+ * @see CodeBuilder#sipush CodeBuilder::sipush
* @since 24
*/
sealed interface ArgumentConstantInstruction extends ConstantInstruction
@@ -89,9 +136,6 @@ sealed interface ArgumentConstantInstruction extends ConstantInstruction
@Override
Integer constantValue();
- /**
- * {@return the type of the constant}
- */
@Override
default TypeKind typeKind() {
return TypeKind.INT;
@@ -99,9 +143,24 @@ default TypeKind typeKind() {
}
/**
- * Models a "load constant" instruction (e.g., {@code
- * ldc}).
+ * Models a "load constant" instruction, which encodes the constant value
+ * in the constant pool. Includes {@link Opcode#LDC ldc} and {@link
+ * Opcode#LDC_W ldc_w}, and {@link Opcode#LDC2_W ldc2_w} instructions.
+ * <p>
+ * A load constant instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="LoadConstantInstruction" target="CodeBuilder#ldc(LoadableConstantEntry)" :
+ * LoadConstantInstruction(LoadableConstantEntry constantEntry) // @link substring="constantEntry" target="#constantEntry()"
+ * }
+ * <p>
+ * A "load constant" instruction can load any constant value supported by
+ * other constant-load instructions. However, other instructions are
+ * usually more optimized, avoiding extra constant pool entries and being
+ * smaller.
*
+ * @see Opcode.Kind#CONSTANT
+ * @see ConstantInstruction#ofLoad ConstantInstruction::ofLoad
+ * @see CodeBuilder#ldc CodeBuilder::ldc
* @since 24
*/
sealed interface LoadConstantInstruction extends ConstantInstruction
@@ -113,9 +172,6 @@ sealed interface LoadConstantInstruction extends ConstantInstruction
*/
LoadableConstantEntry constantEntry();
- /**
- * {@return the type of the constant}
- */
@Override
default TypeKind typeKind() {
return constantEntry().typeKind();
@@ -139,6 +195,10 @@ static IntrinsicConstantInstruction ofIntrinsic(Opcode op) {
/**
* {@return an argument constant instruction}
+ * <p>
+ * {@code value} must be in the range of {@code byte}, {@code [-128, 127]},
+ * for {@link Opcode#BIPUSH}, and in the range of {@code short}, {@code
+ * [-32768, 32767]}, for {@link Opcode#SIPUSH}.
*
* @param op the opcode for the specific type of argument constant instruction,
* which must be {@link Opcode#BIPUSH} or {@link Opcode#SIPUSH}
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ConvertInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ConvertInstruction.java
index 468685779b9..0edffda1af1 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ConvertInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ConvertInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -36,10 +37,27 @@
/**
* Models a primitive conversion instruction in the {@code code} array of a
- * {@code Code} attribute, such as {@code i2l}. Corresponding opcodes will have
- * a {@code kind} of {@link Opcode.Kind#CONVERT}. Delivered as a {@link
- * CodeElement} when traversing the elements of a {@link CodeModel}.
+ * {@code Code} attribute, such as {@link Opcode#I2L i2l}. Corresponding opcodes
+ * have a {@linkplain Opcode#kind() kind} of {@link Opcode.Kind#CONVERT}.
+ * Delivered as a {@link CodeElement} when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A primitive conversion instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="ConvertInstruction" target="#of(TypeKind, TypeKind)" :
+ * ConvertInstruction(
+ * TypeKind fromType, // @link substring="fromType" target="#fromType"
+ * TypeKind toType // @link substring="toType" target="#toType"
+ * )
+ * }
+ * where these conversions are valid:
+ * <ul>
+ * <li>Between {@code int}, {@code long}, {@code float}, and {@code double}, where
+ * {@code fromType != toType};
+ * <li>From {@code int} to {@code byte}, {@code char}, and {@code short}.
+ * </ul>
*
+ * @see Opcode.Kind#CONVERT
+ * @see CodeBuilder#conversion CodeBuilder::conversion
* @since 24
*/
public sealed interface ConvertInstruction extends Instruction
@@ -55,10 +73,16 @@ public sealed interface ConvertInstruction extends Instruction
TypeKind toType();
/**
- * {@return A conversion instruction}
+ * {@return a conversion instruction} Valid conversions are:
+ * <ul>
+ * <li>Between {@code int}, {@code long}, {@code float}, and {@code double},
+ * where {@code fromType != toType};
+ * <li>From {@code int} to {@code byte}, {@code char}, and {@code short}.
+ * </ul>
*
* @param fromType the type to convert from
* @param toType the type to convert to
+ * @throws IllegalArgumentException if this is not a valid conversion
*/
static ConvertInstruction of(TypeKind fromType, TypeKind toType) {
return of(BytecodeHelpers.convertOpcode(fromType, toType));
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java
index 4e8ddcef385..4170e142ffe 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java
@@ -24,32 +24,54 @@
*/
package java.lang.classfile.instruction;
-import java.lang.classfile.CodeElement;
-import java.lang.classfile.CodeModel;
-import java.lang.classfile.Instruction;
-import java.lang.classfile.Label;
-import java.lang.classfile.Opcode;
+import java.lang.classfile.*;
import jdk.internal.classfile.impl.AbstractInstruction;
import jdk.internal.classfile.impl.BytecodeHelpers;
import jdk.internal.classfile.impl.Util;
/**
- * Models instruction discontinued from the {@code code} array of a {@code Code}
- * attribute. Delivered as a {@link CodeElement} when traversing the elements of
- * a {@link CodeModel}.
+ * Marker interface for instruction discontinued from the {@code code} array of
+ * a {@code Code} attribute. Delivered as a {@link CodeElement} when traversing
+ * the elements of a {@link CodeModel}.
*
+ * @apiNote
+ * While most instructions have convenience factory methods in {@link
+ * CodeBuilder}, discontinued instructions can only be supplied to code builders
+ * explicitly with {@link CodeBuilder#with CodeBuilder::with} to discourage
+ * their use.
+ *
+ * @jvms 4.9.1 Static Constraints
+ * @sealedGraph
* @since 24
*/
public sealed interface DiscontinuedInstruction extends Instruction {
/**
- * Models JSR and JSR_W instructions discontinued from the {@code code}
- * array of a {@code Code} attribute since class file version 51.0.
- * Corresponding opcodes will have a {@code kind} of
- * {@link Opcode.Kind#DISCONTINUED_JSR}. Delivered as a {@link CodeElement}
- * when traversing the elements of a {@link CodeModel}.
+ * Models jump subroutine instructions discontinued from the {@code code}
+ * array of a {@code Code} attribute since class file major version {@value
+ * ClassFile#JAVA_7_VERSION} (JVMS {@jvms 4.9.1}). Corresponding opcodes
+ * have a {@linkplain Opcode#kind() kind} of {@link Opcode.Kind#DISCONTINUED_JSR}.
+ * Delivered as a {@link CodeElement} when traversing the elements of a
+ * {@link CodeModel}.
+ * <p>
+ * A jump subroutine instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="JsrInstruction" target="#of(Label)" :
+ * JsrInstruction(Label target) // @link substring="target" target="#target()"
+ * }
+ * <p>
+ * Due to physical restrictions, {@link Opcode#JSR jsr} instructions cannot
+ * encode labels too far away in the list of code elements. In such cases,
+ * the {@link ClassFile.ShortJumpsOption} controls how an invalid {@code jsr}
+ * instruction model is written by a {@link CodeBuilder}.
+ * <p>
+ * Jump subroutine instructions push a {@link TypeKind##returnAddress
+ * returnAddress} value to the operand stack, and {@link StoreInstruction
+ * astore} series of instructions can then store this value to a local
+ * variable slot.
*
+ * @see Opcode.Kind#DISCONTINUED_JSR
* @since 24
*/
sealed interface JsrInstruction extends DiscontinuedInstruction
@@ -57,14 +79,18 @@ sealed interface JsrInstruction extends DiscontinuedInstruction
AbstractInstruction.UnboundJsrInstruction {
/**
- * {@return the target of the JSR instruction}
+ * {@return the target of the jump subroutine instruction}
*/
Label target();
/**
- * {@return a JSR instruction}
+ * {@return a jump subroutine instruction}
*
- * @param op the opcode for the specific type of JSR instruction,
+ * @apiNote
+ * The explicit {@code op} argument allows creating {@link Opcode#JSR_W
+ * jsr_w} instructions to avoid short jumps.
+ *
+ * @param op the opcode for the specific type of jump subroutine instruction,
* which must be of kind {@link Opcode.Kind#DISCONTINUED_JSR}
* @param target target label of the subroutine
* @throws IllegalArgumentException if the opcode kind is not
@@ -76,7 +102,7 @@ static JsrInstruction of(Opcode op, Label target) {
}
/**
- * {@return a JSR instruction}
+ * {@return a jump subroutine instruction}
*
* @param target target label of the subroutine
*/
@@ -86,12 +112,26 @@ static JsrInstruction of(Label target) {
}
/**
- * Models RET and RET_W instructions discontinued from the {@code code}
- * array of a {@code Code} attribute since class file version 51.0.
- * Corresponding opcodes will have a {@code kind} of
+ * Models return from subroutine instructions discontinued from the {@code
+ * code} array of a {@code Code} attribute since class file major version
+ * {@value ClassFile#JAVA_7_VERSION} (JVMS {@jvms 4.9.1}).
+ * Corresponding opcodes have a {@linkplain Opcode#kind() kind} of
* {@link Opcode.Kind#DISCONTINUED_RET}. Delivered as a {@link CodeElement}
* when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A return from subroutine instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="RetInstruction" target="#of(int)" :
+ * RetInstruction(int slot) // @link substring="slot" target="#slot()"
+ * }
+ * where {@code slot} must be within {@code [0, 65535]}.
+ * <p>
+ * {@link StoreInstruction astore} series of instructions store a {@link
+ * TypeKind##returnAddress returnAddress} value to a local variable slot,
+ * making the slot usable by a return from subroutine instruction.
*
+ * @jvms 6.5.ret <em>ret</em>
+ * @see Opcode.Kind#DISCONTINUED_RET
* @since 24
*/
sealed interface RetInstruction extends DiscontinuedInstruction
@@ -100,13 +140,23 @@ sealed interface RetInstruction extends DiscontinuedInstruction
/**
* {@return the local variable slot with return address}
+ * The value is within {@code [0, 65535]}.
*/
int slot();
/**
- * {@return a RET or RET_W instruction}
+ * {@return a return from subroutine instruction}
+ * <p>
+ * {@code slot} must be in the closed range of {@code [0, 255]} for
+ * {@link Opcode#RET ret}, or within {@code [0, 65535]} for {@link
+ * Opcode#RET_W wide ret}.
+ *
+ * @apiNote
+ * The explicit {@code op} argument allows creating {@code wide ret}
+ * instructions with {@code slot} in the range of regular {@code ret}
+ * instructions.
*
- * @param op the opcode for the specific type of RET instruction,
+ * @param op the opcode for the specific type of return from subroutine instruction,
* which must be of kind {@link Opcode.Kind#DISCONTINUED_RET}
* @param slot the local variable slot to load return address from
* @throws IllegalArgumentException if the opcode kind is not
@@ -118,7 +168,9 @@ static RetInstruction of(Opcode op, int slot) {
}
/**
- * {@return a RET instruction}
+ * {@return a return from subroutine instruction}
+ * <p>
+ * {@code slot} must be within {@code [0, 65535]}.
*
* @param slot the local variable slot to load return address from
* @throws IllegalArgumentException if {@code slot} is out of range
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ExceptionCatch.java b/src/java.base/share/classes/java/lang/classfile/instruction/ExceptionCatch.java
index 885f029d108..2a86c4bd09c 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ExceptionCatch.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ExceptionCatch.java
@@ -24,23 +24,37 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Label;
import java.lang.classfile.PseudoInstruction;
+import java.lang.classfile.attribute.CodeAttribute;
import java.lang.classfile.constantpool.ClassEntry;
import java.util.Optional;
import jdk.internal.classfile.impl.AbstractPseudoInstruction;
/**
- * A pseudo-instruction modeling an entry in the exception table of a code
- * attribute. Entries in the exception table model catch and finally blocks.
- * Delivered as a {@link CodeElement} when traversing the contents
- * of a {@link CodeModel}.
- *
- * @see PseudoInstruction
+ * A pseudo-instruction modeling an entry in the {@code exception_table} array
+ * of a {@link CodeAttribute Code} attribute. Catch (JVMS {@jvms 3.12}) and
+ * finally (JVMS {@jvms 3.14}) blocks in Java source code compile to exception
+ * table entries. Delivered as a {@link CodeElement} when traversing the
+ * contents of a {@link CodeModel}.
+ * <p>
+ * An exception table entry is composite:
+ * {@snippet lang=text :
+ * // @link substring="ExceptionCatch" target="#of(Label, Label, Label, Optional)" :
+ * ExceptionCatch(
+ * Label handler, // @link substring="handler" target="#handler"
+ * Label tryStart, // @link substring="tryStart" target="#tryStart"
+ * Label tryEnd, // @link substring="tryEnd" target="#tryEnd"
+ * Optional<ClassEntry> catchType // @link substring="catchType" target="#catchType"
+ * )
+ * }
*
+ * @see CodeBuilder#exceptionCatch CodeBuilder::exceptionCatch
+ * @jvms 4.7.3 The {@code Code} Attribute
* @since 24
*/
public sealed interface ExceptionCatch extends PseudoInstruction
@@ -61,8 +75,8 @@ public sealed interface ExceptionCatch extends PseudoInstruction
Label tryEnd();
/**
- * {@return the type of the exception to catch, or empty if this handler is
- * unconditional}
+ * {@return the type of the exception to catch, or empty if this handler
+ * catches everything}
*/
Optional<ClassEntry> catchType();
@@ -80,10 +94,10 @@ static ExceptionCatch of(Label handler, Label tryStart, Label tryEnd,
}
/**
- * {@return an exception table pseudo-instruction for an unconditional handler}
+ * {@return an exception table pseudo-instruction to catch everything}
* @param handler the handler for the exception
- * @param tryStart the beginning of the instruction range for the gaurded instructions
- * @param tryEnd the end of the instruction range for the gaurded instructions
+ * @param tryStart the beginning of the instruction range for the guarded instructions
+ * @param tryEnd the end of the instruction range for the guarded instructions
*/
static ExceptionCatch of(Label handler, Label tryStart, Label tryEnd) {
return new AbstractPseudoInstruction.ExceptionCatchImpl(handler, tryStart, tryEnd, (ClassEntry) null);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/FieldInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/FieldInstruction.java
index b547abd18ab..68d56667957 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/FieldInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/FieldInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -40,10 +41,21 @@
/**
* Models a field access instruction in the {@code code} array of a {@code Code}
- * attribute. Corresponding opcodes will have a {@code kind} of {@link
- * Opcode.Kind#FIELD_ACCESS}. Delivered as a {@link CodeElement} when
+ * attribute. Corresponding opcodes have a {@linkplain Opcode#kind() kind}
+ * of {@link Opcode.Kind#FIELD_ACCESS}. Delivered as a {@link CodeElement} when
* traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A field access instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="FieldInstruction" target="#of(Opcode, FieldRefEntry)" :
+ * FieldInstruction(
+ * Opcode opcode, // @link substring="opcode" target="#opcode()"
+ * FieldRefEntry field, // @link substring="field" target="#field()"
+ * )
+ * }
*
+ * @see Opcode.Kind#FIELD_ACCESS
+ * @see CodeBuilder#fieldAccess CodeBuilder::fieldAccess
* @since 24
*/
public sealed interface FieldInstruction extends Instruction
@@ -68,7 +80,11 @@ default Utf8Entry name() {
}
/**
- * {@return the field descriptor of the field}
+ * {@return the field descriptor string of the field}
+ *
+ * @apiNote
+ * A symbolic descriptor for the type of the field is available through
+ * {@link #typeSymbol() typeSymbol()}.
*/
default Utf8Entry type() {
return field().nameAndType().type();
@@ -103,6 +119,8 @@ static FieldInstruction of(Opcode op, FieldRefEntry field) {
* @param owner the class holding the field
* @param name the name of the field
* @param type the field descriptor
+ * @throws IllegalArgumentException if the opcode kind is not
+ * {@link Opcode.Kind#FIELD_ACCESS}.
*/
static FieldInstruction of(Opcode op,
ClassEntry owner,
@@ -118,6 +136,8 @@ static FieldInstruction of(Opcode op,
* which must be of kind {@link Opcode.Kind#FIELD_ACCESS}
* @param owner the class holding the field
* @param nameAndType the name and field descriptor of the field
+ * @throws IllegalArgumentException if the opcode kind is not
+ * {@link Opcode.Kind#FIELD_ACCESS}.
*/
static FieldInstruction of(Opcode op,
ClassEntry owner,
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/IncrementInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/IncrementInstruction.java
index 7ea516c7cc5..a874ef0a954 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/IncrementInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/IncrementInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -33,10 +34,27 @@
/**
* Models a local variable increment instruction in the {@code code} array of a
- * {@code Code} attribute. Corresponding opcodes will have a {@code kind} of
- * {@link Opcode.Kind#INCREMENT}. Delivered as a {@link CodeElement} when
+ * {@code Code} attribute. Corresponding opcodes have a {@linkplain Opcode#kind()
+ * kind} of {@link Opcode.Kind#INCREMENT}. Delivered as a {@link CodeElement} when
* traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A local variable increment instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="IncrementInstruction" target="#of" :
+ * IncrementInstruction(
+ * int slot, // @link substring="slot" target="#slot()"
+ * int constant // @link substring="constant" target="#constant()"
+ * )
+ * }
+ * where
+ * <ul>
+ * <li>{@code slot} must be within {@code [0, 65535]}.
+ * <li>{@code constant} must be within {@code [-32768, 32767]}.
+ * </ul>
*
+ * @see Opcode.Kind#INCREMENT
+ * @see CodeBuilder#iinc CodeBuilder::iinc
+ * @jvms 6.5.iinc <em>iinc</em>
* @since 24
*/
public sealed interface IncrementInstruction extends Instruction
@@ -54,6 +72,10 @@ public sealed interface IncrementInstruction extends Instruction
/**
* {@return an increment instruction}
+ * <ul>
+ * <li>{@code slot} must be within {@code [0, 65535]}.
+ * <li>{@code constant} must be within {@code [-32768, 32767]}.
+ * </ul>
*
* @param slot the local variable slot to increment
* @param constant the value to increment by
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/InvokeDynamicInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/InvokeDynamicInstruction.java
index 43907b2a518..7cad91b9d8d 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/InvokeDynamicInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/InvokeDynamicInstruction.java
@@ -24,9 +24,11 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
+import java.lang.classfile.Opcode;
import java.lang.classfile.constantpool.InvokeDynamicEntry;
import java.lang.classfile.constantpool.LoadableConstantEntry;
import java.lang.classfile.constantpool.Utf8Entry;
@@ -40,10 +42,20 @@
import jdk.internal.classfile.impl.Util;
/**
- * Models an {@code invokedynamic} instruction in the {@code code} array of a
- * {@code Code} attribute. Delivered as a {@link CodeElement} when traversing
- * the elements of a {@link CodeModel}.
+ * Models a dynamically-computed call site invocation instruction in the
+ * {@code code} array of a {@code Code} attribute. The corresponding opcode is
+ * {@link Opcode#INVOKEDYNAMIC invokedynamic}. Delivered as a {@link
+ * CodeElement} when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A dynamically-computed call site invocation instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="InvokeDynamicInstruction" target="#of" :
+ * InvokeDynamicInstruction(InvokeDynamicEntry invokedynamic) // @link substring="invokedynamic" target="#invokedynamic()"
+ * }
*
+ * @see Opcode.Kind#INVOKE_DYNAMIC
+ * @see CodeBuilder#invokedynamic CodeBuilder::invokedynamic
+ * @jvms 6.5.invokedynamic <em>invokedynamic</em>
* @since 24
*/
public sealed interface InvokeDynamicInstruction extends Instruction
@@ -62,6 +74,10 @@ default Utf8Entry name() {
/**
* {@return the invocation type of the call site}
+ *
+ * @apiNote
+ * A symbolic descriptor for the invocation typeis available through {@link
+ * #typeSymbol() typeSymbol()}.
*/
default Utf8Entry type() {
return invokedynamic().type();
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/InvokeInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/InvokeInstruction.java
index 904a17375ac..50791cbd0ff 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/InvokeInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/InvokeInstruction.java
@@ -24,10 +24,12 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
import java.lang.classfile.Opcode;
+import java.lang.classfile.TypeKind;
import java.lang.classfile.constantpool.ClassEntry;
import java.lang.classfile.constantpool.InterfaceMethodRefEntry;
import java.lang.classfile.constantpool.MemberRefEntry;
@@ -42,10 +44,26 @@
/**
* Models a method invocation instruction in the {@code code} array of a {@code
- * Code} attribute, other than {@code invokedynamic}. Corresponding opcodes
- * will have a {@code kind} of {@link Opcode.Kind#INVOKE}. Delivered as a
- * {@link CodeElement} when traversing the elements of a {@link CodeModel}.
+ * Code} attribute, other than {@link InvokeDynamicInstruction invokedynamic}.
+ * Corresponding opcodes have a {@linkplain Opcode#kind() kind} of {@link Opcode.Kind#INVOKE}.
+ * Delivered as a {@link CodeElement} when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A method invocation instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="InvokeInstruction" target="#of(Opcode, MemberRefEntry)" :
+ * InvokeInstruction(
+ * Opcode opcode, // @link substring="opcode" target="#opcode()"
+ * MethodRefEntry | InterfaceMethodRefEntry method) // @link substring="method" target="#method()"
+ * )
+ * }
+ * where {@code method} must be an {@code InterfaceMethodRefEntry} for {@link
+ * Opcode#INVOKEINTERFACE invokeinterface} opcode, and must be a {@code
+ * MethodRefEntry} for {@link Opcode#INVOKEVIRTUAL invokevirtual} opcode.
+ * {@link Opcode#INVOKESTATIC invokestatic} and {@link Opcode#INVOKESPECIAL
+ * invokespecial} can have either type of entry for {@code method}.
*
+ * @see Opcode.Kind#INVOKE
+ * @see CodeBuilder#invoke CodeBuilder::invoke
* @since 24
*/
public sealed interface InvokeInstruction extends Instruction
@@ -57,18 +75,25 @@ public sealed interface InvokeInstruction extends Instruction
MemberRefEntry method();
/**
- * {@return whether the class holding the method is an interface}
+ * {@return whether the class or interface holding the method is an interface}
*/
boolean isInterface();
/**
- * {@return the {@code count} value of an {@code invokeinterface} instruction, as defined in JVMS {@jvms 6.5}
- * or {@code 0} for {@code invokespecial}, {@code invokestatic} and {@code invokevirtual} instructions}
+ * {@return the {@code count} value of an {@code invokeinterface} instruction,
+ * or {@code 0} for other instructions}
+ * <p>
+ * For an {@code invokeinterface} instruction, this value must be equivalent
+ * to the sum of {@linkplain TypeKind#slotSize() slot sizes} of all arguments
+ * plus one, which is equal to the number of operand stack depth consumed by
+ * this interface method invocation instruction.
+ *
+ * @jvms 6.5.invokeinterface <em>invokeinterface</em>
*/
int count();
/**
- * {@return the class holding the method}
+ * {@return the class or interface holding the method}
*/
default ClassEntry owner() {
return method().owner();
@@ -82,7 +107,11 @@ default Utf8Entry name() {
}
/**
- * {@return the method descriptor of the method}
+ * {@return the method descriptor string of the method}
+ *
+ * @apiNote
+ * A symbolic descriptor for the type of the method is available through
+ * {@link #typeSymbol() typeSymbol()}.
*/
default Utf8Entry type() {
return method().nameAndType().type();
@@ -95,7 +124,6 @@ default MethodTypeDesc typeSymbol() {
return Util.methodTypeSymbol(method().type());
}
-
/**
* {@return an invocation instruction}
*
@@ -103,7 +131,7 @@ default MethodTypeDesc typeSymbol() {
* which must be of kind {@link Opcode.Kind#INVOKE}
* @param method a constant pool entry describing the method
* @throws IllegalArgumentException if the opcode kind is not
- * {@link Opcode.Kind#INVOKE}.
+ * {@link Opcode.Kind#INVOKE}
*/
static InvokeInstruction of(Opcode op, MemberRefEntry method) {
Util.checkKind(op, Opcode.Kind.INVOKE);
@@ -119,6 +147,8 @@ static InvokeInstruction of(Opcode op, MemberRefEntry method) {
* @param name the name of the method
* @param type the method descriptor
* @param isInterface whether the class holding the method is an interface
+ * @throws IllegalArgumentException if the opcode kind is not
+ * {@link Opcode.Kind#INVOKE}
*/
static InvokeInstruction of(Opcode op,
ClassEntry owner,
@@ -136,6 +166,8 @@ static InvokeInstruction of(Opcode op,
* @param owner the class holding the method
* @param nameAndType the name and type of the method
* @param isInterface whether the class holding the method is an interface
+ * @throws IllegalArgumentException if the opcode kind is not
+ * {@link Opcode.Kind#INVOKE}
*/
static InvokeInstruction of(Opcode op,
ClassEntry owner,
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LabelTarget.java b/src/java.base/share/classes/java/lang/classfile/instruction/LabelTarget.java
index bc1deffc98b..c5b49973133 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LabelTarget.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LabelTarget.java
@@ -24,10 +24,13 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
+import java.lang.classfile.CodeTransform;
import java.lang.classfile.Label;
import java.lang.classfile.PseudoInstruction;
+import java.lang.classfile.attribute.CodeAttribute;
import jdk.internal.classfile.impl.LabelImpl;
@@ -35,9 +38,28 @@
* A pseudo-instruction which indicates that the specified label corresponds to
* the current position in the {@code Code} attribute. Delivered as a {@link
* CodeElement} during traversal of the elements of a {@link CodeModel}.
+ * <p>
+ * This can be used to inspect the target position of labels across {@linkplain
+ * CodeTransform transformations}, as {@linkplain CodeAttribute#labelToBci bci}
+ * is not stable.
+ * <p>
+ * When passed to a {@link CodeBuilder}, this pseudo-instruction sets the
+ * specified label to be bound at the current position in the builder.
+ * <p>
+ * By design, {@code LabelTarget} cannot be created by users and can only be
+ * read from a code model. Use {@link CodeBuilder#labelBinding
+ * CodeBuilder::labelBinding} to bind arbitrary labels to a {@code CodeBuilder}.
+ * <p>
+ * For a {@code CodeBuilder cob}, a {@code LabelTarget lt}, these two calls are
+ * equivalent:
+ * {@snippet lang=java :
+ * cob.with(lt); // @link substring="with" target="CodeBuilder#with"
+ * // @link substring="labelBinding" target="CodeBuilder#labelBinding" :
+ * cob.labelBinding(lt.label()); // @link substring="label" target="#label"
+ * }
*
- * @see PseudoInstruction
- *
+ * @see Label
+ * @see CodeBuilder#labelBinding CodeBuilder::labelBinding
* @since 24
*/
public sealed interface LabelTarget extends PseudoInstruction
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LineNumber.java b/src/java.base/share/classes/java/lang/classfile/instruction/LineNumber.java
index a9a497708c0..3f10a3ada0d 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LineNumber.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LineNumber.java
@@ -25,21 +25,42 @@
package java.lang.classfile.instruction;
import java.lang.classfile.ClassFile;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.PseudoInstruction;
+import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.attribute.LineNumberInfo;
import java.lang.classfile.attribute.LineNumberTableAttribute;
import jdk.internal.classfile.impl.LineNumberImpl;
/**
- * A pseudo-instruction which models a single entry in the
- * {@link LineNumberTableAttribute}. Delivered as a {@link CodeElement}
- * during traversal of the elements of a {@link CodeModel}, according to
- * the setting of the {@link ClassFile.LineNumbersOption} option.
+ * A pseudo-instruction which indicates the code for a given line number starts
+ * after the current position in a {@link CodeAttribute Code} attribute. This
+ * models a single entry in the {@link LineNumberTableAttribute LineNumberTable}
+ * attribute. Delivered as a {@link CodeElement} during traversal of the
+ * elements of a {@link CodeModel}, according to the setting of the {@link
+ * ClassFile.LineNumbersOption} option.
+ * <p>
+ * A line number entry is composite:
+ * {@snippet lang=text :
+ * // @link substring="LineNumber" target="#of" :
+ * LineNumber(int line) // @link substring="int line" target="#line"
+ * }
+ * <p>
+ * Another model, {@link LineNumberInfo}, also models a line number entry; it
+ * has no dependency on a {@code CodeModel} and represents of bci values as
+ * {@code int}s instead of order of pseudo-instructions in the elements of a
+ * {@code CodeModel}, and is used as components of a {@link LineNumberTableAttribute}.
*
- * @see PseudoInstruction
+ * @apiNote
+ * Line numbers are represented with custom pseudo-instructions to avoid using
+ * labels, which usually indicate branching targets for the control flow.
*
+ * @see LineNumberInfo
+ * @see CodeBuilder#lineNumber CodeBuilder::lineNumber
+ * @see ClassFile.LineNumbersOption
* @since 24
*/
public sealed interface LineNumber extends PseudoInstruction
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LoadInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/LoadInstruction.java
index c499dcc9944..81961320be3 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LoadInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LoadInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -36,10 +37,23 @@
/**
* Models a local variable load instruction in the {@code code} array of a
- * {@code Code} attribute. Corresponding opcodes will have a {@code kind} of
- * {@link Opcode.Kind#LOAD}. Delivered as a {@link CodeElement} when
- * traversing the elements of a {@link CodeModel}.
+ * {@code Code} attribute. Corresponding opcodes have a {@linkplain
+ * Opcode#kind() kind} of {@link Opcode.Kind#LOAD}. Delivered as a {@link
+ * CodeElement} when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A local variable load instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="LoadInstruction" target="#of(TypeKind, int)" :
+ * LoadInstruction(
+ * TypeKind typeKind, // @link substring="typeKind" target="#typeKind"
+ * int slot // @link substring="slot" target="#slot"
+ * )
+ * }
+ * where {@code TypeKind} is {@linkplain TypeKind##computational-type
+ * computational}, and {@code slot} is within {@code [0, 65535]}.
*
+ * @see Opcode.Kind#LOAD
+ * @see CodeBuilder#loadLocal CodeBuilder::loadLocal
* @since 24
*/
public sealed interface LoadInstruction extends Instruction
@@ -48,16 +62,21 @@ public sealed interface LoadInstruction extends Instruction
/**
* {@return the local variable slot to load from}
+ * The value is within {@code [0, 65535]}.
*/
int slot();
/**
- * {@return the type of the value to be loaded}
+ * {@return the {@linkplain TypeKind##computational-type computational type}
+ * of the value to be loaded}
*/
TypeKind typeKind();
/**
* {@return a local variable load instruction}
+ * {@code kind} is {@linkplain TypeKind#asLoadable() converted} to its
+ * computational type.
+ * {@code slot} must be within {@code [0, 65535]}.
*
* @param kind the type of the value to be loaded
* @param slot the local variable slot to load from
@@ -71,6 +90,20 @@ static LoadInstruction of(TypeKind kind, int slot) {
/**
* {@return a local variable load instruction}
+ * <p>
+ * The range of {@code slot} is restricted by the {@code op} and its
+ * {@linkplain Opcode#sizeIfFixed() size}:
+ * <ul>
+ * <li>If {@code op} has size 1, {@code slot} must be exactly the slot value
+ * implied by the opcode.
+ * <li>If {@code op} has size 2, {@code slot} must be within {@code [0, 255]}.
+ * <li>If {@code op} has size 4, {@code slot} must be within {@code [0, 65535]}.
+ * </ul>
+ *
+ * @apiNote
+ * The explicit {@code op} argument allows creating {@code wide} or
+ * regular load instructions when the {@code slot} can be encoded
+ * with more optimized load instructions.
*
* @param op the opcode for the specific type of load instruction,
* which must be of kind {@link Opcode.Kind#LOAD}
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariable.java b/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariable.java
index 0f8cb672e51..f44a4e094f1 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariable.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariable.java
@@ -25,10 +25,12 @@
package java.lang.classfile.instruction;
import java.lang.classfile.ClassFile;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Label;
import java.lang.classfile.PseudoInstruction;
+import java.lang.classfile.attribute.LocalVariableInfo;
import java.lang.classfile.attribute.LocalVariableTableAttribute;
import java.lang.classfile.constantpool.Utf8Entry;
import java.lang.constant.ClassDesc;
@@ -39,19 +41,45 @@
import jdk.internal.classfile.impl.Util;
/**
- * A pseudo-instruction which models a single entry in the
- * {@link LocalVariableTableAttribute}. Delivered as a {@link CodeElement}
- * during traversal of the elements of a {@link CodeModel}, according to
- * the setting of the {@link ClassFile.DebugElementsOption} option.
+ * A pseudo-instruction which models a single entry in the {@link
+ * LocalVariableTableAttribute LocalVariableTable} attribute. Delivered as a
+ * {@link CodeElement} during traversal of the elements of a {@link CodeModel},
+ * according to the setting of the {@link ClassFile.DebugElementsOption} option.
+ * <p>
+ * A local variable entry is composite:
+ * {@snippet lang=text :
+ * // @link substring="LocalVariable" target="#of(int, String, ClassDesc, Label, Label)" :
+ * LocalVariable(
+ * int slot, // @link substring="slot" target="#slot"
+ * String name, // @link substring="name" target="#name"
+ * ClassDesc type, // @link substring="type" target="#type"
+ * Label startScope, // @link substring="startScope" target="#startScope"
+ * Label endScope // @link substring="endScope" target="#endScope"
+ * )
+ * }
+ * Where {@code slot} is within {@code [0, 65535]}.
+ * <p>
+ * Another model, {@link LocalVariableInfo}, also models a local variable
+ * entry; it has no dependency on a {@code CodeModel} and represents of bci
+ * values as {@code int}s instead of {@code Label}s, and is used as components
+ * of a {@link LocalVariableTableAttribute}.
*
- * @see PseudoInstruction
+ * @apiNote
+ * {@code LocalVariable} is used for all local variables in Java source code.
+ * If a local variable has a parameterized type, a type argument, or an array
+ * type of one of the previous types, a {@link LocalVariableType} should be
+ * created for that local variable as well.
*
+ * @see LocalVariableInfo
+ * @see CodeBuilder#localVariable CodeBuilder::localVariable
+ * @see ClassFile.DebugElementsOption
* @since 24
*/
public sealed interface LocalVariable extends PseudoInstruction
permits AbstractPseudoInstruction.UnboundLocalVariable, BoundLocalVariable {
/**
* {@return the local variable slot}
+ * The value is within {@code [0, 65535]}.
*/
int slot();
@@ -61,7 +89,11 @@ public sealed interface LocalVariable extends PseudoInstruction
Utf8Entry name();
/**
- * {@return the local variable field descriptor}
+ * {@return the local variable field descriptor string}
+ *
+ * @apiNote
+ * A symbolic descriptor for the type of the local variable is available
+ * through {@link #typeSymbol() typeSymbol()}.
*/
Utf8Entry type();
@@ -84,6 +116,7 @@ default ClassDesc typeSymbol() {
/**
* {@return a local variable pseudo-instruction}
+ * {@code slot} must be within {@code [0, 65535]}.
*
* @param slot the local variable slot
* @param nameEntry the local variable name
@@ -99,6 +132,7 @@ static LocalVariable of(int slot, Utf8Entry nameEntry, Utf8Entry descriptorEntry
/**
* {@return a local variable pseudo-instruction}
+ * {@code slot} must be within {@code [0, 65535]}.
*
* @param slot the local variable slot
* @param name the local variable name
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariableType.java b/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariableType.java
index c9427491733..1e28804a837 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariableType.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariableType.java
@@ -24,12 +24,8 @@
*/
package java.lang.classfile.instruction;
-import java.lang.classfile.ClassFile;
-import java.lang.classfile.CodeElement;
-import java.lang.classfile.CodeModel;
-import java.lang.classfile.Label;
-import java.lang.classfile.PseudoInstruction;
-import java.lang.classfile.Signature;
+import java.lang.classfile.*;
+import java.lang.classfile.attribute.LocalVariableTypeInfo;
import java.lang.classfile.attribute.LocalVariableTypeTableAttribute;
import java.lang.classfile.constantpool.Utf8Entry;
@@ -39,16 +35,44 @@
/**
* A pseudo-instruction which models a single entry in the {@link
- * LocalVariableTypeTableAttribute}. Delivered as a {@link CodeElement} during
- * traversal of the elements of a {@link CodeModel}, according to the setting of
- * the {@link ClassFile.DebugElementsOption} option.
+ * LocalVariableTypeTableAttribute LocalVariableTypeTable} attribute. Delivered
+ * as a {@link CodeElement} during traversal of the elements of a {@link CodeModel},
+ * according to the setting of the {@link ClassFile.DebugElementsOption} option.
+ * <p>
+ * A local variable type entry is composite:
+ * {@snippet lang=text :
+ * // @link substring="LocalVariableType" target="#of(int, String, Signature, Label, Label)" :
+ * LocalVariableType(
+ * int slot, // @link substring="slot" target="#slot"
+ * String name, // @link substring="name" target="#name"
+ * Signature signature, // @link substring="signature" target="#signatureSymbol"
+ * Label startScope, // @link substring="startScope" target="#startScope"
+ * Label endScope // @link substring="endScope" target="#endScope"
+ * )
+ * }
+ * Where {@code slot} is within {@code [0, 65535]}.
+ * <p>
+ * Another model, {@link LocalVariableTypeInfo}, also models a local variable
+ * type entry; it has no dependency on a {@code CodeModel} and represents of bci
+ * values as {@code int}s instead of {@code Label}s, and is used as components
+ * of a {@link LocalVariableTypeTableAttribute}.
*
+ * @apiNote
+ * {@code LocalVariableType} is used if a local variable has a parameterized
+ * type, a type argument, or an array type of one of the previous types as its
+ * type. A {@link LocalVariable} with the erased type should still be created
+ * for that local variable.
+ *
+ * @see LocalVariableTypeInfo
+ * @see CodeBuilder#localVariableType CodeBuilder::localVariableType
+ * @see ClassFile.DebugElementsOption
* @since 24
*/
public sealed interface LocalVariableType extends PseudoInstruction
permits AbstractPseudoInstruction.UnboundLocalVariableType, BoundLocalVariableType {
/**
* {@return the local variable slot}
+ * The value is within {@code [0, 65535]}.
*/
int slot();
@@ -58,12 +82,16 @@ public sealed interface LocalVariableType extends PseudoInstruction
Utf8Entry name();
/**
- * {@return the local variable signature}
+ * {@return the local variable generic signature string}
+ *
+ * @apiNote
+ * A symbolic generic signature of the local variable is available
+ * through {@link #signatureSymbol() signatureSymbol()}.
*/
Utf8Entry signature();
/**
- * {@return the local variable signature}
+ * {@return the local variable generic signature}
*/
default Signature signatureSymbol() {
return Signature.parseFrom(signature().stringValue());
@@ -81,6 +109,7 @@ default Signature signatureSymbol() {
/**
* {@return a local variable type pseudo-instruction}
+ * {@code slot} must be within {@code [0, 65535]}.
*
* @param slot the local variable slot
* @param nameEntry the local variable name
@@ -96,6 +125,7 @@ static LocalVariableType of(int slot, Utf8Entry nameEntry, Utf8Entry signatureEn
/**
* {@return a local variable type pseudo-instruction}
+ * {@code slot} must be within {@code [0, 65535]}.
*
* @param slot the local variable slot
* @param name the local variable name
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LookupSwitchInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/LookupSwitchInstruction.java
index 7b286e9cfd2..33e3ec002fd 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LookupSwitchInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LookupSwitchInstruction.java
@@ -24,19 +24,36 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
import java.lang.classfile.Label;
+import java.lang.classfile.Opcode;
import java.util.List;
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models a {@code lookupswitch} instruction in the {@code code} array of a
- * {@code Code} attribute. Delivered as a {@link CodeElement} when traversing
- * the elements of a {@link CodeModel}.
+ * Models a {@link Opcode#LOOKUPSWITCH lookupswitch} instruction in the {@code
+ * code} array of a {@code Code} attribute. Delivered as a {@link CodeElement}
+ * when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A lookup switch instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="LookupSwitchInstruction" target="#of" :
+ * LookupSwitchInstruction(
+ * Label defaultTarget, // @link substring="defaultTarget" target="#defaultTarget"
+ * List<SwitchCase> cases // @link substring="cases" target="#cases()"
+ * )
+ * }
+ * If elements in {@code cases} are not sorted ascending by their {@link
+ * SwitchCase#caseValue caseValue}, a sorted version of the {@code cases} list
+ * will be written instead.
*
+ * @see Opcode.Kind#LOOKUP_SWITCH
+ * @see CodeBuilder#lookupswitch CodeBuilder::lookupswitch
+ * @jvms 6.5.lookupswitch <em>lookupswitch</em>
* @since 24
*/
public sealed interface LookupSwitchInstruction extends Instruction
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/MonitorInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/MonitorInstruction.java
index 1c8268cddd6..0efdfbdb34f 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/MonitorInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/MonitorInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -33,9 +34,17 @@
import jdk.internal.classfile.impl.Util;
/**
- * Models a {@code monitorenter} or {@code monitorexit} instruction in the
- * {@code code} array of a {@code Code} attribute. Delivered as a {@link
- * CodeElement} when traversing the elements of a {@link CodeModel}.
+ * Models a {@link Opcode#MONITORENTER monitorenter} or {@link Opcode#MONITOREXIT
+ * monitorexit} instruction in the {@code code} array of a {@code Code} attribute.
+ * Corresponding opcodes have a {@linkplain Opcode#kind() kind} of {@link
+ * Opcode.Kind#MONITOR}. Delivered as a {@link CodeElement} when traversing the
+ * elements of a {@link CodeModel}.
+ * <p>
+ * A monitor instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="MonitorInstruction" target="#of(Opcode)" :
+ * MonitorInstruction(Opcode opcode) // @link substring="opcode" target="#opcode"
+ * }
*
* @since 24
*/
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/NewMultiArrayInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/NewMultiArrayInstruction.java
index 4a1f6cfd170..f7efd144422 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/NewMultiArrayInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/NewMultiArrayInstruction.java
@@ -24,19 +24,34 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
+import java.lang.classfile.Opcode;
import java.lang.classfile.constantpool.ClassEntry;
import jdk.internal.classfile.impl.AbstractInstruction;
import jdk.internal.classfile.impl.BytecodeHelpers;
/**
- * Models a {@code multianewarray} invocation instruction in the {@code code}
+ * Models a {@link Opcode#MULTIANEWARRAY multianewarray} instruction in the {@code code}
* array of a {@code Code} attribute. Delivered as a {@link CodeElement}
* when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A new multi-dimensional array instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="NewMultiArrayInstruction" target="#of" :
+ * NewMultiArrayInstruction(
+ * ClassEntry arrayType, // @link substring="arrayType" target="#arrayType"
+ * int dimensions // @link substring="dimensions" target="#dimensions"
+ * )
+ * }
+ * where the {@code arrayType} is an array class.
*
+ * @see Opcode.Kind#NEW_MULTI_ARRAY
+ * @see CodeBuilder#multianewarray CodeBuilder::multianewarray
+ * @jvms 6.5.multianewarray <em>multianewarray</em>
* @since 24
*/
public sealed interface NewMultiArrayInstruction extends Instruction
@@ -44,7 +59,7 @@ public sealed interface NewMultiArrayInstruction extends Instruction
AbstractInstruction.UnboundNewMultidimensionalArrayInstruction {
/**
- * {@return the type of the array, as a symbolic descriptor}
+ * {@return the type of the array}
*/
ClassEntry arrayType();
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/NewObjectInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/NewObjectInstruction.java
index f063733b64f..62b0233be87 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/NewObjectInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/NewObjectInstruction.java
@@ -24,18 +24,30 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
+import java.lang.classfile.Opcode;
import java.lang.classfile.constantpool.ClassEntry;
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models a {@code new} instruction in the {@code code} array of a {@code Code}
+ * Models a {@link Opcode#NEW new} instruction in the {@code code} array of a {@code Code}
* attribute. Delivered as a {@link CodeElement} when traversing the elements
* of a {@link CodeModel}.
+ * <p>
+ * A new object instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="NewObjectInstruction" target="#of" :
+ * NewObjectInstruction(ClassEntry className) // @link substring="className" target="#className"
+ * }
+ * where the {@code className} is a non-abstract class.
*
+ * @see Opcode.Kind#NEW_OBJECT
+ * @see CodeBuilder#new_ CodeBuilder::new_
+ * @jvms 6.5.new <em>new</em>
* @since 24
*/
public sealed interface NewObjectInstruction extends Instruction
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
index 411bf7f6b55..c1e2c9d12fa 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
@@ -24,18 +24,30 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
+import java.lang.classfile.Opcode;
import java.lang.classfile.TypeKind;
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models a {@code newarray} invocation instruction in the {@code code}
+ * Models a {@link Opcode#NEWARRAY newarray} instruction in the {@code code}
* array of a {@code Code} attribute. Delivered as a {@link CodeElement}
* when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A new primitive array instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="NewPrimitiveArrayInstruction" target="#of" :
+ * NewPrimitiveArrayInstruction(TypeKind typeKind) // @link substring="typeKind" target="#typeKind"
+ * }
+ * where {@code typeKind} is primitive and not {@code void}.
*
+ * @see Opcode.Kind#NEW_PRIMITIVE_ARRAY
+ * @see CodeBuilder#newarray CodeBuilder::newarray
+ * @jvms 6.5.newarray <em>newarray</em>
* @since 24
*/
public sealed interface NewPrimitiveArrayInstruction extends Instruction
@@ -43,6 +55,10 @@ public sealed interface NewPrimitiveArrayInstruction extends Instruction
AbstractInstruction.UnboundNewPrimitiveArrayInstruction {
/**
* {@return the component type of the array}
+ *
+ * @apiNote
+ * The backing array code for this instruction is available through
+ * {@link TypeKind#newarrayCode() typeKind().newarrayCode()}.
*/
TypeKind typeKind();
@@ -50,8 +66,9 @@ public sealed interface NewPrimitiveArrayInstruction extends Instruction
* {@return a new primitive array instruction}
*
* @param typeKind the component type of the array
- * @throws IllegalArgumentException when the {@code typeKind} is not a legal
- * primitive array component type
+ * @throws IllegalArgumentException when {@code typeKind} is not primitive
+ * or is {@code void}
+ * @see TypeKind#fromNewarrayCode(int) TypeKind::fromNewarrayCode
*/
static NewPrimitiveArrayInstruction of(TypeKind typeKind) {
// Implicit null-check:
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/NewReferenceArrayInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/NewReferenceArrayInstruction.java
index c85ed9dd3d9..a092c068a36 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/NewReferenceArrayInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/NewReferenceArrayInstruction.java
@@ -24,18 +24,29 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
+import java.lang.classfile.Opcode;
import java.lang.classfile.constantpool.ClassEntry;
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models a {@code anewarray} invocation instruction in the {@code code}
+ * Models a {@link Opcode#ANEWARRAY anewarray} instruction in the {@code code}
* array of a {@code Code} attribute. Delivered as a {@link CodeElement}
* when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A new reference array instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="NewReferenceArrayInstruction" target="#of" :
+ * NewReferenceArrayInstruction(ClassEntry componentType) // @link substring="componentType" target="#componentType"
+ * }
*
+ * @see Opcode.Kind#NEW_REF_ARRAY
+ * @see CodeBuilder#newarray CodeBuilder::anewarray
+ * @jvms 6.5.anewarray <em>anewarray</em>
* @since 24
*/
public sealed interface NewReferenceArrayInstruction extends Instruction
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/NopInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/NopInstruction.java
index 3c11803109a..cf0b9f25ac9 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/NopInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/NopInstruction.java
@@ -24,17 +24,23 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
+import java.lang.classfile.Opcode;
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models a {@code nop} invocation instruction in the {@code code}
+ * Models a {@link Opcode#NOP nop} instruction in the {@code code}
* array of a {@code Code} attribute. Delivered as a {@link CodeElement}
* when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A no-op instruction has no visible state.
*
+ * @see CodeBuilder#nop CodeBuilder::nop
+ * @jvms 6.5.nop <em>nop</em>
* @since 24
*/
public sealed interface NopInstruction extends Instruction
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/OperatorInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/OperatorInstruction.java
index d1eb8aa1a3d..b4daf55e3a5 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/OperatorInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/OperatorInstruction.java
@@ -35,23 +35,31 @@
/**
* Models an arithmetic operator instruction in the {@code code} array of a
- * {@code Code} attribute. Corresponding opcodes will have a {@code kind} of
+ * {@code Code} attribute. Corresponding opcodes have a {@linkplain Opcode#kind() kind} of
* {@link Opcode.Kind#OPERATOR}. Delivered as a {@link CodeElement} when
* traversing the elements of a {@link CodeModel}.
+ * <p>
+ * An operator instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="OperatorInstruction" target="#of" :
+ * OperatorInstruction(Opcode opcode) // @link substring="opcode" target="#opcode()"
+ * }
*
+ * @see Opcode.Kind#OPERATOR
* @since 24
*/
public sealed interface OperatorInstruction extends Instruction
permits AbstractInstruction.UnboundOperatorInstruction {
/**
* {@return the operand type of the instruction}
+ * This is derived from the {@link #opcode opcode}.
*/
TypeKind typeKind();
/**
* {@return an operator instruction}
*
- * @param op the opcode for the specific type of array load instruction,
+ * @param op the opcode for the specific type of operator instruction,
* which must be of kind {@link Opcode.Kind#OPERATOR}
* @throws IllegalArgumentException if the opcode kind is not
* {@link Opcode.Kind#OPERATOR}.
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ReturnInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ReturnInstruction.java
index 3bbb96b1cbe..aca9196eabf 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ReturnInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ReturnInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -36,22 +37,35 @@
/**
* Models a return-from-method instruction in the {@code code} array of a
- * {@code Code} attribute. Corresponding opcodes will have a {@code kind} of
+ * {@code Code} attribute. Corresponding opcodes have a {@linkplain Opcode#kind() kind} of
* {@link Opcode.Kind#RETURN}. Delivered as a {@link CodeElement} when
* traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A return-from-method instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="ReturnInstruction" target="#of(TypeKind)" :
+ * ReturnInstruction(TypeKind typeKind) // @link substring="typeKind" target="#typeKind()"
+ * }
+ * where {@code typeKind} is {@linkplain TypeKind##computational-type
+ * computational} or {@link TypeKind#VOID void}.
*
+ * @see Opcode.Kind#RETURN
+ * @see CodeBuilder#return_(TypeKind) CodeBuilder::return_
* @since 24
*/
public sealed interface ReturnInstruction extends Instruction
permits AbstractInstruction.UnboundReturnInstruction {
/**
- * {@return the type of the return instruction}
+ * {@return the {@linkplain TypeKind##computational-type computational type}, including
+ * {@link TypeKind#VOID void}, of the return instruction}
*/
TypeKind typeKind();
/**
* {@return a return instruction}
+ * {@code typeKind} is {@linkplain TypeKind#asLoadable() converted} to its
+ * computational type.
*
* @param typeKind the type of the return instruction
*/
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/StackInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/StackInstruction.java
index b01b206e368..8ef413937bc 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/StackInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/StackInstruction.java
@@ -34,10 +34,17 @@
/**
* Models a stack manipulation instruction in the {@code code} array of a
- * {@code Code} attribute. Corresponding opcodes will have a {@code kind} of
+ * {@code Code} attribute. Corresponding opcodes have a {@linkplain Opcode#kind() kind} of
* {@link Opcode.Kind#STACK}. Delivered as a {@link CodeElement} when
* traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A stack manipulation instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="StackInstruction" target="#of" :
+ * StackInstruction(Opcode opcode) // @link substring="opcode" target="#opcode()"
+ * }
*
+ * @see Opcode.Kind#STACK
* @since 24
*/
public sealed interface StackInstruction extends Instruction
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/StoreInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/StoreInstruction.java
index 1d7bdce1fdf..93d33e0b7c2 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/StoreInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/StoreInstruction.java
@@ -24,6 +24,7 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
@@ -36,10 +37,28 @@
/**
* Models a local variable store instruction in the {@code code} array of a
- * {@code Code} attribute. Corresponding opcodes will have a {@code kind} of
+ * {@code Code} attribute. Corresponding opcodes have a {@linkplain Opcode#kind() kind} of
* {@link Opcode.Kind#STORE}. Delivered as a {@link CodeElement} when
* traversing the elements of a {@link CodeModel}.
+ * <p>
+ * A local variable store instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="StoreInstruction" target="#of(TypeKind, int)" :
+ * StoreInstruction(
+ * TypeKind typeKind, // @link substring="typeKind" target="#typeKind"
+ * int slot // @link substring="slot" target="#slot"
+ * )
+ * }
+ * where {@code TypeKind} is {@linkplain TypeKind##computational-type
+ * computational}, and {@code slot} is within {@code [0, 65535]}.
+ * <p>
+ * {@code astore} series of instructions, or {@code reference} type store
+ * instructions, can also operate on the {@link TypeKind##returnAddress
+ * returnAddress} type from discontinued {@linkplain
+ * DiscontinuedInstruction.JsrInstruction jump subroutine instructions}.
*
+ * @see Opcode.Kind#STORE
+ * @see CodeBuilder#storeLocal CodeBuilder::storeLocal
* @since 24
*/
public sealed interface StoreInstruction extends Instruction
@@ -47,16 +66,23 @@ public sealed interface StoreInstruction extends Instruction
/**
* {@return the local variable slot to store to}
+ * The value is within {@code [0, 65535]}.
*/
int slot();
/**
- * {@return the type of the value to be stored}
+ * {@return the {@linkplain TypeKind##computational-type computational type}
+ * of the value to be stored} The {@link TypeKind#REFERENCE reference}
+ * type store instructions also operate on the {@code returnAddress} type,
+ * which does not apply to {@code reference} type load instructions.
*/
TypeKind typeKind();
/**
* {@return a local variable store instruction}
+ * {@code kind} is {@linkplain TypeKind#asLoadable() converted} to its
+ * computational type.
+ * {@code slot} must be within {@code [0, 65535]}.
*
* @param kind the type of the value to be stored
* @param slot the local variable slot to store to
@@ -70,6 +96,20 @@ static StoreInstruction of(TypeKind kind, int slot) {
/**
* {@return a local variable store instruction}
+ * <p>
+ * The range of {@code slot} is restricted by the {@code op} and its
+ * {@linkplain Opcode#sizeIfFixed() size}:
+ * <ul>
+ * <li>If {@code op} has size 1, {@code slot} must be exactly the slot value
+ * implied by the opcode.
+ * <li>If {@code op} has size 2, {@code slot} must be within {@code [0, 255]}.
+ * <li>If {@code op} has size 4, {@code slot} must be within {@code [0, 65535]}.
+ * </ul>
+ *
+ * @apiNote
+ * The explicit {@code op} argument allows creating {@code wide} or
+ * regular store instructions when the {@code slot} can be encoded
+ * with more optimized store instructions.
*
* @param op the opcode for the specific type of store instruction,
* which must be of kind {@link Opcode.Kind#STORE}
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/SwitchCase.java b/src/java.base/share/classes/java/lang/classfile/instruction/SwitchCase.java
index 3f5f91031b6..cce8f8ef03a 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/SwitchCase.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/SwitchCase.java
@@ -29,12 +29,20 @@
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models a single case in a {@code lookupswitch} or {@code tableswitch}
- * instruction.
+ * Models a single case in a {@link LookupSwitchInstruction lookupswitch} or
+ * {@link TableSwitchInstruction tableswitch} instruction.
+ * <p>
+ * A switch case is composite:
+ * {@snippet lang=text :
+ * // @link substring="SwitchCase" target="#of" :
+ * SwitchCase(
+ * int caseValue, // @link substring="caseValue" target="#caseValue"
+ * Label target // @link substring="target" target="#target"
+ * )
+ * }
*
* @see LookupSwitchInstruction
* @see TableSwitchInstruction
- *
* @since 24
*/
public sealed interface SwitchCase
@@ -47,11 +55,10 @@ public sealed interface SwitchCase
Label target();
/**
- * Create a {@linkplain SwitchCase}
+ * {@return a new switch case}
*
* @param caseValue the integer value for the case
* @param target the branch target for the case
- * @return the {@linkplain SwitchCase}
*/
static SwitchCase of(int caseValue, Label target) {
return new AbstractInstruction.SwitchCaseImpl(caseValue, target);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/TableSwitchInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/TableSwitchInstruction.java
index bbe7a4d6c0c..3f7245fad49 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/TableSwitchInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/TableSwitchInstruction.java
@@ -24,19 +24,45 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
import java.lang.classfile.Label;
+import java.lang.classfile.Opcode;
import java.util.List;
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models a {@code tableswitch} instruction in the {@code code} array of a
+ * Models a {@link Opcode#TABLESWITCH tableswitch} instruction in the {@code code} array of a
* {@code Code} attribute. Delivered as a {@link CodeElement} when traversing
* the elements of a {@link CodeModel}.
+ * <p>
+ * A table switch instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="TableSwitchInstruction" target="#of" :
+ * TableSwitchInstruction(
+ * int lowValue, // @link substring="int lowValue" target="#lowValue"
+ * int highValue, // @link substring="int highValue" target="#highValue"
+ * Label defaultTarget, // @link substring="defaultTarget" target="#defaultTarget"
+ * List<SwitchCase> cases // @link substring="cases" target="#cases()"
+ * )
+ * }
+ * <p>
+ * When read from {@code class} files, the {@code cases} may omit cases that
+ * duplicate the default target. The list is sorted ascending by the {@link
+ * SwitchCase#caseValue() caseValue}.
+ * <p>
+ * When writing to {@code class} file, the order in the {@code cases} list does
+ * not matter, as there is only one valid order in the physical representation
+ * of table switch entries. Treatment of elements in {@code cases} whose value
+ * is less than {@code lowValue} or greater than {@code highValue}, and elements
+ * whose value duplicates that of another, is not specified.
*
+ * @see Opcode.Kind#TABLE_SWITCH
+ * @see CodeBuilder#tableswitch CodeBuilder::tableswitch
+ * @jvms 6.5.tableswitch <em>tableswitch</em>
* @since 24
*/
public sealed interface TableSwitchInstruction extends Instruction
@@ -67,7 +93,8 @@ public sealed interface TableSwitchInstruction extends Instruction
* @param lowValue the low value of the switch target range, inclusive
* @param highValue the high value of the switch target range, inclusive
* @param defaultTarget the default target of the switch
- * @param cases the cases of the switch
+ * @param cases the cases of the switch; duplicate or out of bound case
+ * handling is not specified
*/
static TableSwitchInstruction of(int lowValue, int highValue, Label defaultTarget, List<SwitchCase> cases) {
return new AbstractInstruction.UnboundTableSwitchInstruction(lowValue, highValue, defaultTarget, cases);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ThrowInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ThrowInstruction.java
index ec6fdc38626..4504b855c4c 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ThrowInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ThrowInstruction.java
@@ -24,17 +24,23 @@
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.Instruction;
+import java.lang.classfile.Opcode;
import jdk.internal.classfile.impl.AbstractInstruction;
/**
- * Models an {@code athrow} instruction in the {@code code} array of a
+ * Models an {@link Opcode#ATHROW athrow} instruction in the {@code code} array of a
* {@code Code} attribute. Delivered as a {@link CodeElement} when traversing
* the elements of a {@link CodeModel}.
+ * <p>
+ * A throw instruction has no visible state.
*
+ * @see Opcode.Kind#THROW_EXCEPTION
+ * @see CodeBuilder#athrow CodeBuiler::athrow
* @since 24
*/
public sealed interface ThrowInstruction extends Instruction
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/TypeCheckInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/TypeCheckInstruction.java
index 032e7a8462b..3091cf05e71 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/TypeCheckInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/TypeCheckInstruction.java
@@ -36,9 +36,24 @@
import jdk.internal.classfile.impl.Util;
/**
- * Models an {@code instanceof} or {@code checkcast} instruction in the {@code
- * code} array of a {@code Code} attribute. Delivered as a {@link CodeElement}
- * when traversing the elements of a {@link CodeModel}.
+ * Models an {@link Opcode#INSTANCEOF instanceof} or a {@link Opcode#CHECKCAST checkcast}
+ * instruction in the {@code code} array of a {@code Code} attribute. Corresponding
+ * opcodes have a {@linkplain Opcode#kind() kind} of {@link Opcode.Kind#TYPE_CHECK}.
+ * Delivered as a {@link CodeElement} when traversing the elements of a {@link CodeModel}.
+ * <p>
+ * An {@code instanceof} checks the type and pushes an integer to the operand stack.
+ * A {@code checkcast} checks the type and throws a {@link ClassCastException} if
+ * the check fails. {@code instanceof} treat the {@code null} reference as a
+ * failure, while {@code checkcast} treat the {@code null} reference as a success.
+ * <p>
+ * A type check instruction is composite:
+ * {@snippet lang=text :
+ * // @link substring="TypeCheckInstruction" target="#of(Opcode, ClassEntry)" :
+ * TypeCheckInstruction(
+ * Opcode opcode, // @link substring="opcode" target="#opcode"
+ * ClassEntry type // @link substring="type" target="#type"
+ * )
+ * }
*
* @since 24
*/
@@ -47,7 +62,7 @@ public sealed interface TypeCheckInstruction extends Instruction
AbstractInstruction.UnboundTypeCheckInstruction {
/**
- * {@return the type against which the instruction checks or casts}
+ * {@return the type against which the instruction checks}
*/
ClassEntry type();
@@ -58,7 +73,7 @@ public sealed interface TypeCheckInstruction extends Instruction
* which must be of kind {@link Opcode.Kind#TYPE_CHECK}
* @param type the type against which to check or cast
* @throws IllegalArgumentException if the opcode kind is not
- * {@link Opcode.Kind#TYPE_CHECK}.
+ * {@link Opcode.Kind#TYPE_CHECK}
*/
static TypeCheckInstruction of(Opcode op, ClassEntry type) {
Util.checkKind(op, Opcode.Kind.TYPE_CHECK);
@@ -71,6 +86,8 @@ static TypeCheckInstruction of(Opcode op, ClassEntry type) {
* @param op the opcode for the specific type of type check instruction,
* which must be of kind {@link Opcode.Kind#TYPE_CHECK}
* @param type the type against which to check or cast
+ * @throws IllegalArgumentException if the opcode kind is not
+ * {@link Opcode.Kind#TYPE_CHECK}, or if {@code type} is primitive
*/
static TypeCheckInstruction of(Opcode op, ClassDesc type) {
return of(op, TemporaryConstantPool.INSTANCE.classEntry(type));
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/package-info.java b/src/java.base/share/classes/java/lang/classfile/instruction/package-info.java
index d2a36e16615..e732aadf1ec 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/package-info.java
@@ -26,9 +26,45 @@
/**
* <h2>Provides interfaces describing code instructions for the {@link java.lang.classfile} library.</h2>
*
- * The {@code java.lang.classfile.attribute} package contains interfaces describing code instructions.
+ * The {@code java.lang.classfile.instruction} package contains interfaces describing code instructions.
+ * Implementations of these interfaces are immutable.
+ * <p>
+ * Unless otherwise specified, passing {@code null} or an array or collection containing a {@code null} element as an
+ * argument to a constructor or method of any Class-File API class or interface will cause a {@link NullPointerException}
+ * to be thrown.
*
+ * <h2 id="reading">Reading of instructions</h2>
+ * Instructions and pseudo-instructions are usually accessed from a {@link CodeModel}, such as {@link CodeModel#forEach
+ * CodeModel::forEach}, and categorized by pattern-matching.
+ * <p>
+ * When read from {@code class} files, instructions are lazily inflated; the contents of these instructions, besides the
+ * bare structure, are not evaluated to speed up parsing. Instructions to users interest, such as those filtered by the
+ * pattern matching, have their contents read on demand, to avoid unnecessary reading of unrelated instructions in a code
+ * array.
+ * <p>
+ * Due to the lazy nature of {@code class} file parsing, {@link IllegalArgumentException} indicating malformed
+ * {@code class} file data can be thrown at any method invocation. For example, an instruction object for a {@link
+ * TypeCheckInstruction} may be obtained from a {@code CodeModel}, but the subsequent invocation of {@link
+ * TypeCheckInstruction#type() .type()} may fail with {@code IllegalArgumentException} because the instruction refers
+ * to a bad constant pool index.
+ *
+ * <h2 id="writing">Writing of instructions</h2>
+ * Writing of instructions happen on {@link CodeBuilder}. The most basic way to write instructions is to pass an
+ * instruction object to {@link CodeBuilder#with CodeBuilder::with}, which supports all valid instructions.
+ * Yet, {@code CodeBuilder} provides a lot of {@linkplain CodeBuilder##instruction-factories convenience factory methods}
+ * for easy creation of instructions, named by their mnemonic. These accessors are more concise, and often more
+ * efficient at run-time than passing instruction objects.
+ * <p>
+ * Due to restrictions in the {@code class} file format, some instructions may not be representable in a {@code CodeBuilder}.
+ * In some scenarios, such as for {@link BranchInstruction}, Class-File API options control if alternatives can be used
+ * in code generation instead. Otherwise, they can be configured to fail-fast to ensure the parity of {@code CodeBuilder}
+ * commands with the generated {@code code} array data.
+ *
+ * @jvms 6.5 Instructions
* @since 24
*/
package java.lang.classfile.instruction;
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.CodeModel;
+
diff --git a/src/java.base/share/classes/java/lang/constant/ModuleDesc.java b/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
index b9690b7d0b3..0cc6ff9fd48 100644
--- a/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/foreign/AddressLayout.java b/src/java.base/share/classes/java/lang/foreign/AddressLayout.java
index 6e188c5a317..4ea48df134e 100644
--- a/src/java.base/share/classes/java/lang/foreign/AddressLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/AddressLayout.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/foreign/SegmentAllocator.java b/src/java.base/share/classes/java/lang/foreign/SegmentAllocator.java
index 6c9cf51bee8..6e8cd789a36 100644
--- a/src/java.base/share/classes/java/lang/foreign/SegmentAllocator.java
+++ b/src/java.base/share/classes/java/lang/foreign/SegmentAllocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/foreign/package-info.java b/src/java.base/share/classes/java/lang/foreign/package-info.java
index 18419ba1877..438d42ae7d1 100644
--- a/src/java.base/share/classes/java/lang/foreign/package-info.java
+++ b/src/java.base/share/classes/java/lang/foreign/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/foreign/snippet-files/Snippets.java b/src/java.base/share/classes/java/lang/foreign/snippet-files/Snippets.java
index f305586ac61..693e2db006f 100644
--- a/src/java.base/share/classes/java/lang/foreign/snippet-files/Snippets.java
+++ b/src/java.base/share/classes/java/lang/foreign/snippet-files/Snippets.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java b/src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
index 4aa3a0a05b7..d473be64218 100644
--- a/src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
index 3f35b5144fb..b7983d18b2e 100644
--- a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
+++ b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/ConstantGroup.java b/src/java.base/share/classes/java/lang/invoke/ConstantGroup.java
index 55b5641efb3..bd1aca47233 100644
--- a/src/java.base/share/classes/java/lang/invoke/ConstantGroup.java
+++ b/src/java.base/share/classes/java/lang/invoke/ConstantGroup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java
index 90da523dec8..0c5a0eab6aa 100644
--- a/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/MemberName.java b/src/java.base/share/classes/java/lang/invoke/MemberName.java
index dec1cf5718a..717a1562a1a 100644
--- a/src/java.base/share/classes/java/lang/invoke/MemberName.java
+++ b/src/java.base/share/classes/java/lang/invoke/MemberName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index 24210849192..c6c9d05ec31 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java
index 35cc610dad1..b634f5dd255 100644
--- a/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java b/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
index f372e053260..b444bd7a3ce 100644
--- a/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
+++ b/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
index 995cb38e3ca..3cd523ee1cf 100644
--- a/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
+++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/module/package-info.java b/src/java.base/share/classes/java/lang/module/package-info.java
index 7b9f60c17e1..45dc40d5218 100644
--- a/src/java.base/share/classes/java/lang/module/package-info.java
+++ b/src/java.base/share/classes/java/lang/module/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/ref/PhantomReference.java b/src/java.base/share/classes/java/lang/ref/PhantomReference.java
index 50fede558be..cf84d47181a 100644
--- a/src/java.base/share/classes/java/lang/ref/PhantomReference.java
+++ b/src/java.base/share/classes/java/lang/ref/PhantomReference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/ref/package-info.java b/src/java.base/share/classes/java/lang/ref/package-info.java
index 099fb148f77..1faf3957770 100644
--- a/src/java.base/share/classes/java/lang/ref/package-info.java
+++ b/src/java.base/share/classes/java/lang/ref/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
index 6f6f9fa6754..df33bd64d19 100644
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/lang/runtime/ObjectMethods.java b/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
index f887c1a3b8f..a93a7ef9a26 100644
--- a/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
+++ b/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/nio/file/FileTreeIterator.java b/src/java.base/share/classes/java/nio/file/FileTreeIterator.java
index 0f8c646dc5e..ae9d5b4b044 100644
--- a/src/java.base/share/classes/java/nio/file/FileTreeIterator.java
+++ b/src/java.base/share/classes/java/nio/file/FileTreeIterator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/security/DigestInputStream.java b/src/java.base/share/classes/java/security/DigestInputStream.java
index 000747cbe8d..e7955d13f9b 100644
--- a/src/java.base/share/classes/java/security/DigestInputStream.java
+++ b/src/java.base/share/classes/java/security/DigestInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/security/DigestOutputStream.java b/src/java.base/share/classes/java/security/DigestOutputStream.java
index b653d34a5ab..9dd6ca2bd7e 100644
--- a/src/java.base/share/classes/java/security/DigestOutputStream.java
+++ b/src/java.base/share/classes/java/security/DigestOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java b/src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java
index 6a0674b940a..c74cde4e170 100644
--- a/src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java
+++ b/src/java.base/share/classes/java/security/cert/PKIXBuilderParameters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/security/cert/PKIXParameters.java b/src/java.base/share/classes/java/security/cert/PKIXParameters.java
index f2e620ec7af..4d2a2b2aaef 100644
--- a/src/java.base/share/classes/java/security/cert/PKIXParameters.java
+++ b/src/java.base/share/classes/java/security/cert/PKIXParameters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/security/cert/X509Certificate.java b/src/java.base/share/classes/java/security/cert/X509Certificate.java
index 79f37a82d47..4e579a75b1c 100644
--- a/src/java.base/share/classes/java/security/cert/X509Certificate.java
+++ b/src/java.base/share/classes/java/security/cert/X509Certificate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/text/AttributedCharacterIterator.java b/src/java.base/share/classes/java/text/AttributedCharacterIterator.java
index d2348fdff16..52790dbec0a 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/text/AttributedString.java b/src/java.base/share/classes/java/text/AttributedString.java
index bab86e97f93..0333efde81b 100644
--- a/src/java.base/share/classes/java/text/AttributedString.java
+++ b/src/java.base/share/classes/java/text/AttributedString.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/text/RuleBasedCollator.java b/src/java.base/share/classes/java/text/RuleBasedCollator.java
index 6c927f6eedb..045ca6e8e9b 100644
--- a/src/java.base/share/classes/java/text/RuleBasedCollator.java
+++ b/src/java.base/share/classes/java/text/RuleBasedCollator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/EnumMap.java b/src/java.base/share/classes/java/util/EnumMap.java
index 478416f1de2..d02b1fdcff7 100644
--- a/src/java.base/share/classes/java/util/EnumMap.java
+++ b/src/java.base/share/classes/java/util/EnumMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/GregorianCalendar.java b/src/java.base/share/classes/java/util/GregorianCalendar.java
index d7332042aaa..9c75cbc5732 100644
--- a/src/java.base/share/classes/java/util/GregorianCalendar.java
+++ b/src/java.base/share/classes/java/util/GregorianCalendar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/HashMap.java b/src/java.base/share/classes/java/util/HashMap.java
index 804047a086a..46c89984be8 100644
--- a/src/java.base/share/classes/java/util/HashMap.java
+++ b/src/java.base/share/classes/java/util/HashMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/HashSet.java b/src/java.base/share/classes/java/util/HashSet.java
index bb447d2aec7..57ecdbd1695 100644
--- a/src/java.base/share/classes/java/util/HashSet.java
+++ b/src/java.base/share/classes/java/util/HashSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/IdentityHashMap.java b/src/java.base/share/classes/java/util/IdentityHashMap.java
index 5c8dc463b31..48a6d7b28df 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java
index 726c7bb923b..dc505bb7f55 100644
--- a/src/java.base/share/classes/java/util/ImmutableCollections.java
+++ b/src/java.base/share/classes/java/util/ImmutableCollections.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/InvalidPropertiesFormatException.java b/src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java
index 1da3a681604..b6dfc54be2c 100644
--- a/src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java
+++ b/src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/LinkedHashMap.java b/src/java.base/share/classes/java/util/LinkedHashMap.java
index 9300aaae1ef..244a63f6b69 100644
--- a/src/java.base/share/classes/java/util/LinkedHashMap.java
+++ b/src/java.base/share/classes/java/util/LinkedHashMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/LinkedHashSet.java b/src/java.base/share/classes/java/util/LinkedHashSet.java
index 77de72d9288..bec2733dae3 100644
--- a/src/java.base/share/classes/java/util/LinkedHashSet.java
+++ b/src/java.base/share/classes/java/util/LinkedHashSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/LinkedList.java b/src/java.base/share/classes/java/util/LinkedList.java
index 3ed44bb78c0..13e7f5fadd6 100644
--- a/src/java.base/share/classes/java/util/LinkedList.java
+++ b/src/java.base/share/classes/java/util/LinkedList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java
index 989cc09f388..4206dda6a3a 100644
--- a/src/java.base/share/classes/java/util/ResourceBundle.java
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java
@@ -3654,8 +3654,7 @@ private static String toPackageName(String bundleName) {
}
- private static final boolean TRACE_ON = Boolean.getBoolean(
- System.getProperty("resource.bundle.debug", "false"));
+ private static final boolean TRACE_ON = Boolean.getBoolean("resource.bundle.debug");
private static void trace(String format, Object... params) {
if (TRACE_ON)
diff --git a/src/java.base/share/classes/java/util/SimpleTimeZone.java b/src/java.base/share/classes/java/util/SimpleTimeZone.java
index 5a7841856b7..58d43692ee0 100644
--- a/src/java.base/share/classes/java/util/SimpleTimeZone.java
+++ b/src/java.base/share/classes/java/util/SimpleTimeZone.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/Timer.java b/src/java.base/share/classes/java/util/Timer.java
index 4f1b69c8e71..eacd68c70a6 100644
--- a/src/java.base/share/classes/java/util/Timer.java
+++ b/src/java.base/share/classes/java/util/Timer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/TreeMap.java b/src/java.base/share/classes/java/util/TreeMap.java
index 79aec5c1456..1e61136bee4 100644
--- a/src/java.base/share/classes/java/util/TreeMap.java
+++ b/src/java.base/share/classes/java/util/TreeMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/TreeSet.java b/src/java.base/share/classes/java/util/TreeSet.java
index 1de5ddba51d..c0d69bc6b0d 100644
--- a/src/java.base/share/classes/java/util/TreeSet.java
+++ b/src/java.base/share/classes/java/util/TreeSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/WeakHashMap.java b/src/java.base/share/classes/java/util/WeakHashMap.java
index fbad7ced0f3..276e8731d84 100644
--- a/src/java.base/share/classes/java/util/WeakHashMap.java
+++ b/src/java.base/share/classes/java/util/WeakHashMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/jar/JarOutputStream.java b/src/java.base/share/classes/java/util/jar/JarOutputStream.java
index 63a151d7aed..3d064feee48 100644
--- a/src/java.base/share/classes/java/util/jar/JarOutputStream.java
+++ b/src/java.base/share/classes/java/util/jar/JarOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/java/util/stream/FindOps.java b/src/java.base/share/classes/java/util/stream/FindOps.java
index afe31a90bdc..5d678351400 100644
--- a/src/java.base/share/classes/java/util/stream/FindOps.java
+++ b/src/java.base/share/classes/java/util/stream/FindOps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
index 698548d373f..1e4e769a83e 100644
--- a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
+++ b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
index 139f02450b8..fc44ec3057e 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/AccessFlagsImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AccessFlagsImpl.java
index ed682bbabb2..43e15c04b6d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AccessFlagsImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AccessFlagsImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/BoundLocalVariable.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundLocalVariable.java
index cb2f9c1f1b7..68743d92671 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundLocalVariable.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundLocalVariable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/CatchBuilderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CatchBuilderImpl.java
index abb024cfa20..d520753326e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CatchBuilderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CatchBuilderImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/EntryMap.java b/src/java.base/share/classes/jdk/internal/classfile/impl/EntryMap.java
index be350cb5814..d64fdde68cf 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/EntryMap.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/EntryMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/InterfacesImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/InterfacesImpl.java
index 72310b64982..d27b5e20ab4 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/InterfacesImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/InterfacesImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/LabelImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/LabelImpl.java
index aac0fafaef1..c7e1639fa56 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/LabelImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/LabelImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/SuperclassImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SuperclassImpl.java
index b30a1089f26..3b4be699e11 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/SuperclassImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/SuperclassImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationBytecodes.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationBytecodes.java
index b12ec5101f5..a7d97c7ea37 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationBytecodes.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationBytecodes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationTable.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationTable.java
index af009297405..0c4131dd1ba 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationTable.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationTable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationType.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationType.java
index ff29d931332..3fb98195cee 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationType.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/event/FileWriteEvent.java b/src/java.base/share/classes/jdk/internal/event/FileWriteEvent.java
index 7a39f93b991..f6c27960430 100644
--- a/src/java.base/share/classes/jdk/internal/event/FileWriteEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/FileWriteEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java b/src/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java
index 8dca527ca4c..fe9cfa31b63 100644
--- a/src/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/event/SerializationMisdeclarationEvent.java b/src/java.base/share/classes/jdk/internal/event/SerializationMisdeclarationEvent.java
index 3ffdf4858e7..a66b3ad79ce 100644
--- a/src/java.base/share/classes/jdk/internal/event/SerializationMisdeclarationEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/SerializationMisdeclarationEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/event/ThreadSleepEvent.java b/src/java.base/share/classes/jdk/internal/event/ThreadSleepEvent.java
index 283ba425977..cb803804d7b 100644
--- a/src/java.base/share/classes/jdk/internal/event/ThreadSleepEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/ThreadSleepEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java b/src/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java
index 6920eb031fe..4d7801a667e 100644
--- a/src/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java b/src/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java
index 5e80e8ac701..1bb6cb7132f 100644
--- a/src/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/foreign/GlobalSession.java b/src/java.base/share/classes/jdk/internal/foreign/GlobalSession.java
index 3fc46d6c0bc..9f57b2a36dd 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/GlobalSession.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/GlobalSession.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/foreign/ImplicitSession.java b/src/java.base/share/classes/jdk/internal/foreign/ImplicitSession.java
index 0b79e45960a..93a899329b7 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/ImplicitSession.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/ImplicitSession.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/foreign/StringSupport.java b/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
index 8f182f3b338..6dc104ff323 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
@@ -130,8 +130,8 @@ public static int strlenByte(final AbstractMemorySegmentImpl segment,
final long toOffset) {
final long length = toOffset - fromOffset;
segment.checkBounds(fromOffset, length);
- if (length == 0) {
- // The state has to be checked explicitly for zero-length segments
+ if (length < Byte.BYTES) {
+ // There can be no null terminator present
segment.scope.checkValidState();
throw nullNotFound(segment, fromOffset, toOffset);
}
@@ -164,7 +164,8 @@ public static int strlenShort(final AbstractMemorySegmentImpl segment,
final long toOffset) {
final long length = toOffset - fromOffset;
segment.checkBounds(fromOffset, length);
- if (length == 0) {
+ if (length < Short.BYTES) {
+ // There can be no null terminator present
segment.scope.checkValidState();
throw nullNotFound(segment, fromOffset, toOffset);
}
@@ -199,19 +200,23 @@ public static int strlenInt(final AbstractMemorySegmentImpl segment,
final long toOffset) {
final long length = toOffset - fromOffset;
segment.checkBounds(fromOffset, length);
- if (length == 0) {
+ if (length < Integer.BYTES) {
+ // There can be no null terminator present
segment.scope.checkValidState();
throw nullNotFound(segment, fromOffset, toOffset);
}
- final long longBytes = length & LONG_MASK;
- final long longLimit = fromOffset + longBytes;
long offset = fromOffset;
- for (; offset < longLimit; offset += Long.BYTES) {
- long val = SCOPED_MEMORY_ACCESS.getLongUnaligned(segment.sessionImpl(), segment.unsafeGetBase(), segment.unsafeGetOffset() + offset, !Architecture.isLittleEndian());
- if (mightContainZeroInt(val)) {
- for (int j = 0; j < Long.BYTES; j += Integer.BYTES) {
- if (SCOPED_MEMORY_ACCESS.getIntUnaligned(segment.sessionImpl(), segment.unsafeGetBase(), segment.unsafeGetOffset() + offset + j, !Architecture.isLittleEndian()) == 0) {
- return requireWithinStringSize(offset + j - fromOffset, segment, fromOffset, toOffset);
+ // For quad byte strings, it does not pay off to use long scanning on x64
+ if (!Architecture.isX64()) {
+ final long longBytes = length & LONG_MASK;
+ final long longLimit = fromOffset + longBytes;
+ for (; offset < longLimit; offset += Long.BYTES) {
+ long val = SCOPED_MEMORY_ACCESS.getLongUnaligned(segment.sessionImpl(), segment.unsafeGetBase(), segment.unsafeGetOffset() + offset, !Architecture.isLittleEndian());
+ if (mightContainZeroInt(val)) {
+ for (int j = 0; j < Long.BYTES; j += Integer.BYTES) {
+ if (SCOPED_MEMORY_ACCESS.getIntUnaligned(segment.sessionImpl(), segment.unsafeGetBase(), segment.unsafeGetOffset() + offset + j, !Architecture.isLittleEndian()) == 0) {
+ return requireWithinStringSize(offset + j - fromOffset, segment, fromOffset, toOffset);
+ }
}
}
}
diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/MemoryLayoutUtil.java b/src/java.base/share/classes/jdk/internal/foreign/layout/MemoryLayoutUtil.java
index 6b8e7738198..76b9982c774 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/layout/MemoryLayoutUtil.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/layout/MemoryLayoutUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/icu/impl/StringPrepDataReader.java b/src/java.base/share/classes/jdk/internal/icu/impl/StringPrepDataReader.java
index e21799c8cc7..42b349686ef 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/StringPrepDataReader.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/StringPrepDataReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java
index cd87db30d7f..4b34ed86ebd 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, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/icu/lang/UCharacterDirection.java b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterDirection.java
index ef995893ddc..503c803503d 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/icu/text/UTF16.java b/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java
index e84e1d4c0d4..75f0ccbda5b 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
index 0e3b178c32b..9ef02364195 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template b/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
index a1116e1df38..c2f5f7fabd0 100644
--- a/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
+++ b/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java b/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java
index ca5ffb2ff68..4f9223d0171 100644
--- a/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java
+++ b/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/module/ModuleInfo.java b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
index 75b3b8fc993..ff3ffada22a 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java b/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
index 6bc32d54a30..98068849484 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java
index 5ac97818097..9ec84b65038 100644
--- a/src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java
+++ b/src/java.base/share/classes/jdk/internal/org/xml/sax/Attributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java
index 89b664705a2..92e9e6db12b 100644
--- a/src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java
+++ b/src/java.base/share/classes/jdk/internal/org/xml/sax/InputSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java
index ef98d4d56cb..d5aa030829d 100644
--- a/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java
+++ b/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java
index ffa049189ae..05221954fcf 100644
--- a/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java
+++ b/src/java.base/share/classes/jdk/internal/org/xml/sax/SAXParseException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java
index c0a93b71d18..bfb8dbb7b39 100644
--- a/src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java
+++ b/src/java.base/share/classes/jdk/internal/org/xml/sax/XMLReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java b/src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java
index 93902adfd2b..1a4c7447e20 100644
--- a/src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java
+++ b/src/java.base/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/platform/Metrics.java b/src/java.base/share/classes/jdk/internal/platform/Metrics.java
index 07d60f7f9fe..50e8d685a72 100644
--- a/src/java.base/share/classes/jdk/internal/platform/Metrics.java
+++ b/src/java.base/share/classes/jdk/internal/platform/Metrics.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/ref/CleanerImpl.java b/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
index bb7293e5d2b..96b06e27498 100644
--- a/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
+++ b/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java b/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java
index 3564a16d0a0..fc475b2ebdd 100644
--- a/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java
+++ b/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/reflect/ConstructorAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessorImpl.java
index 18e69439ac7..13f6804b810 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessorImpl.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/ConstructorAccessorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/reflect/FieldAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/FieldAccessorImpl.java
index be832f2e393..303924a25d8 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/FieldAccessorImpl.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/FieldAccessorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/reflect/MethodAccessorImpl.java b/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorImpl.java
index a8d324d413c..adc4e1e268a 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorImpl.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/util/OctalDigits.java b/src/java.base/share/classes/jdk/internal/util/OctalDigits.java
index 97b1f882f59..c41d0f75574 100644
--- a/src/java.base/share/classes/jdk/internal/util/OctalDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/OctalDigits.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java b/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
index 2b2b5e66a99..629f86b1530 100644
--- a/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
+++ b/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
index 29acaefb710..8ff4742a59d 100644
--- a/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
+++ b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/vm/StackChunk.java b/src/java.base/share/classes/jdk/internal/vm/StackChunk.java
index ab562706c24..67aace055fe 100644
--- a/src/java.base/share/classes/jdk/internal/vm/StackChunk.java
+++ b/src/java.base/share/classes/jdk/internal/vm/StackChunk.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/vm/TranslatedException.java b/src/java.base/share/classes/jdk/internal/vm/TranslatedException.java
index 485d69b5226..366766711f8 100644
--- a/src/java.base/share/classes/jdk/internal/vm/TranslatedException.java
+++ b/src/java.base/share/classes/jdk/internal/vm/TranslatedException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/vm/VMSupport.java b/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
index 4ffb7ef7ebe..c31fa4d441f 100644
--- a/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/vm/annotation/JvmtiMountTransition.java b/src/java.base/share/classes/jdk/internal/vm/annotation/JvmtiMountTransition.java
index ff9f5d8bbbf..894732fb14d 100644
--- a/src/java.base/share/classes/jdk/internal/vm/annotation/JvmtiMountTransition.java
+++ b/src/java.base/share/classes/jdk/internal/vm/annotation/JvmtiMountTransition.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java b/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
index afd6cc62ce5..6e1c363f3d9 100644
--- a/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,56 +234,6 @@ M indexPartiallyInUpperRange(Class<? extends M> mClass, Class<E> eClass,
return defaultImpl.apply(offset, limit);
}
- /* ============================================================================ */
- public interface ShuffleIotaOperation<S extends VectorSpecies<?>,
- SH extends VectorShuffle<?>> {
- SH apply(int length, int start, int step, S s);
- }
-
- @IntrinsicCandidate
- public static
- <E,
- S extends VectorSpecies<E>,
- SH extends VectorShuffle<E>>
- SH shuffleIota(Class<E> eClass, Class<? extends SH> shClass, S s,
- int length,
- int start, int step, int wrap,
- ShuffleIotaOperation<S, SH> defaultImpl) {
- assert isNonCapturingLambda(defaultImpl) : defaultImpl;
- return defaultImpl.apply(length, start, step, s);
- }
-
- public interface ShuffleToVectorOperation<V extends Vector<?>,
- SH extends VectorShuffle<?>> {
- V apply(SH sh);
- }
-
- @IntrinsicCandidate
- public static
- <V extends Vector<E>,
- SH extends VectorShuffle<E>,
- E>
- V shuffleToVector(Class<? extends Vector<E>> vClass, Class<E> eClass, Class<? extends SH> shClass, SH sh,
- int length,
- ShuffleToVectorOperation<V, SH> defaultImpl) {
- assert isNonCapturingLambda(defaultImpl) : defaultImpl;
- return defaultImpl.apply(sh);
- }
-
- public interface WrapShuffleIndexesOperation<SH extends VectorShuffle<?>> {
- SH apply(SH sh);
- }
-
- @IntrinsicCandidate
- public static
- <E,
- SH extends VectorShuffle<E>>
- SH wrapShuffleIndexes(Class<E> eClass, Class<? extends SH> shClass, SH sh, int length,
- WrapShuffleIndexesOperation<SH> defaultImpl) {
- assert isNonCapturingLambda(defaultImpl) : defaultImpl;
- return defaultImpl.apply(sh);
- }
-
/* ============================================================================ */
public interface IndexOperation<V extends Vector<?>,
S extends VectorSpecies<?>> {
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index e72b1595d60..67b173e93df 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -316,8 +316,7 @@
java.desktop;
exports sun.reflect.misc to
java.desktop,
- java.management,
- java.sql.rowset;
+ java.management;
exports sun.security.internal.interfaces to
jdk.crypto.cryptoki;
exports sun.security.internal.spec to
diff --git a/src/java.base/share/classes/sun/invoke/util/ValueConversions.java b/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
index 9f39db5c68d..36bb4854818 100644
--- a/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
+++ b/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/invoke/util/VerifyAccess.java b/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java
index d0110d70f0c..eb17430735e 100644
--- a/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java
+++ b/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/net/dns/ResolverConfiguration.java b/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
index 05feee47bc2..0a210b9a72a 100644
--- a/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
+++ b/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/net/www/ParseUtil.java b/src/java.base/share/classes/sun/net/www/ParseUtil.java
index 3a35f86ab88..628eeb948ad 100644
--- a/src/java.base/share/classes/sun/net/www/ParseUtil.java
+++ b/src/java.base/share/classes/sun/net/www/ParseUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/net/www/content/text/plain.java b/src/java.base/share/classes/sun/net/www/content/text/plain.java
index 33a9032b2bc..412cf14a31e 100644
--- a/src/java.base/share/classes/sun/net/www/content/text/plain.java
+++ b/src/java.base/share/classes/sun/net/www/content/text/plain.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 1996, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
index 16fb1d2ea6c..0e0cde98ee0 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/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 39d05b6e0e4..7bf8280a7ad 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,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
index 0b70a954e4c..d69869975a5 100644
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/nio/ch/PendingFuture.java b/src/java.base/share/classes/sun/nio/ch/PendingFuture.java
index 67b526d8466..69ccbcf6b71 100644
--- a/src/java.base/share/classes/sun/nio/ch/PendingFuture.java
+++ b/src/java.base/share/classes/sun/nio/ch/PendingFuture.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/nio/ch/ThreadPool.java b/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
index b3157008fcb..92aee323823 100644
--- a/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
+++ b/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/nio/cs/HKSCS.java b/src/java.base/share/classes/sun/nio/cs/HKSCS.java
index 56eafcfedf8..04bbd386a31 100644
--- a/src/java.base/share/classes/sun/nio/cs/HKSCS.java
+++ b/src/java.base/share/classes/sun/nio/cs/HKSCS.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
index e5a3e636c2c..82751e3fcd2 100644
--- a/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
+++ b/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
@@ -123,7 +123,7 @@ private static Map<Class<? extends Annotation>, Annotation> parseAnnotations2(
if (AnnotationType.getInstance(klass).retention() == RetentionPolicy.RUNTIME &&
result.put(klass, a) != null) {
throw new AnnotationFormatError(
- "Duplicate annotation for class: "+klass+": " + a);
+ "Duplicate annotation " + klass + " in " + container);
}
}
}
diff --git a/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java b/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java
index 812e77a0a82..92c55f66532 100644
--- a/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java
+++ b/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java
@@ -32,10 +32,6 @@ public final class ReflectUtil {
private ReflectUtil() {
}
- public static Class<?> forName(String name) throws ClassNotFoundException {
- return Class.forName(name);
- }
-
/**
* Ensures that access to a method or field is granted and throws
* IllegalAccessException if not. This method is not suitable for checking
diff --git a/src/java.base/share/classes/sun/security/ec/point/AffinePoint.java b/src/java.base/share/classes/sun/security/ec/point/AffinePoint.java
index bc1530cd61b..d60a01cbf44 100644
--- a/src/java.base/share/classes/sun/security/ec/point/AffinePoint.java
+++ b/src/java.base/share/classes/sun/security/ec/point/AffinePoint.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java b/src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java
index e0e32449e05..b64e26f8974 100644
--- a/src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java
+++ b/src/java.base/share/classes/sun/security/pkcs/PKCS9Attributes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/pkcs/ParsingException.java b/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
index ea7571491a0..18ecc5af824 100644
--- a/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
+++ b/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/pkcs/SignerInfo.java b/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
index 699e68d053c..b1b8fea8353 100644
--- a/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
+++ b/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/provider/CtrDrbg.java b/src/java.base/share/classes/sun/security/provider/CtrDrbg.java
index c4912791d9e..a5a729ecf18 100644
--- a/src/java.base/share/classes/sun/security/provider/CtrDrbg.java
+++ b/src/java.base/share/classes/sun/security/provider/CtrDrbg.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/provider/DSAPublicKey.java b/src/java.base/share/classes/sun/security/provider/DSAPublicKey.java
index 434367c6550..1ba8fbe2ebd 100644
--- a/src/java.base/share/classes/sun/security/provider/DSAPublicKey.java
+++ b/src/java.base/share/classes/sun/security/provider/DSAPublicKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/provider/HashDrbg.java b/src/java.base/share/classes/sun/security/provider/HashDrbg.java
index 4ca769954c4..fee5872484b 100644
--- a/src/java.base/share/classes/sun/security/provider/HashDrbg.java
+++ b/src/java.base/share/classes/sun/security/provider/HashDrbg.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/provider/HmacDrbg.java b/src/java.base/share/classes/sun/security/provider/HmacDrbg.java
index 62a5ffeeb77..18c9215f7ca 100644
--- a/src/java.base/share/classes/sun/security/provider/HmacDrbg.java
+++ b/src/java.base/share/classes/sun/security/provider/HmacDrbg.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
index 218b1f6f4ba..b6ef067d449 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
index aa5297b0040..91bc5f771d6 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index 6c7c8b45149..9afa83a0afc 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index bec6d844847..be95a09006f 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index ee19ff62a38..58794e5dce8 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -25,7 +25,6 @@
package sun.security.ssl;
-import java.lang.invoke.MethodHandles;
import java.net.Socket;
import java.security.*;
import java.security.cert.*;
@@ -52,15 +51,6 @@
final class X509TrustManagerImpl extends X509ExtendedTrustManager
implements X509TrustManager {
- static {
- // eagerly initialize to avoid pinning virtual thread during TLS handshake
- try {
- MethodHandles.lookup().ensureInitialized(AnchorCertificates.class);
- } catch (IllegalAccessException e) {
- throw new ExceptionInInitializerError(e);
- }
- }
-
private final String validatorType;
/**
diff --git a/src/java.base/share/classes/sun/security/util/BitArray.java b/src/java.base/share/classes/sun/security/util/BitArray.java
index 5afcc1e19d3..5f18f17d10f 100644
--- a/src/java.base/share/classes/sun/security/util/BitArray.java
+++ b/src/java.base/share/classes/sun/security/util/BitArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java b/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
index 65f20ac816c..eef1dd4f83a 100644
--- a/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
+++ b/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/util/ECUtil.java b/src/java.base/share/classes/sun/security/util/ECUtil.java
index 966b13beee2..bcda2d7832c 100644
--- a/src/java.base/share/classes/sun/security/util/ECUtil.java
+++ b/src/java.base/share/classes/sun/security/util/ECUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/util/IOUtils.java b/src/java.base/share/classes/sun/security/util/IOUtils.java
index a103f36eb2c..8c3864ce3a6 100644
--- a/src/java.base/share/classes/sun/security/util/IOUtils.java
+++ b/src/java.base/share/classes/sun/security/util/IOUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/util/KeyUtil.java b/src/java.base/share/classes/sun/security/util/KeyUtil.java
index d057bb689e9..fbc0890b34b 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/validator/ValidatorException.java b/src/java.base/share/classes/sun/security/validator/ValidatorException.java
index 5d04460745b..f926f81d9b3 100644
--- a/src/java.base/share/classes/sun/security/validator/ValidatorException.java
+++ b/src/java.base/share/classes/sun/security/validator/ValidatorException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/x509/AlgorithmId.java b/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
index 5f6d84b3023..7d525a9add7 100644
--- a/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
+++ b/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/x509/GeneralNames.java b/src/java.base/share/classes/sun/security/x509/GeneralNames.java
index 982d628d0c0..9dbb9f4ce41 100644
--- a/src/java.base/share/classes/sun/security/x509/GeneralNames.java
+++ b/src/java.base/share/classes/sun/security/x509/GeneralNames.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/x509/GeneralSubtrees.java b/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java
index de9e409a67d..0bfaf5e0a8b 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/security/x509/RFC822Name.java b/src/java.base/share/classes/sun/security/x509/RFC822Name.java
index b30f6e314f3..73dbbe08138 100644
--- a/src/java.base/share/classes/sun/security/x509/RFC822Name.java
+++ b/src/java.base/share/classes/sun/security/x509/RFC822Name.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/util/BuddhistCalendar.java b/src/java.base/share/classes/sun/util/BuddhistCalendar.java
index 37b722d1c74..4067f3486cd 100644
--- a/src/java.base/share/classes/sun/util/BuddhistCalendar.java
+++ b/src/java.base/share/classes/sun/util/BuddhistCalendar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/util/calendar/AbstractCalendar.java b/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java
index ffffd106813..7401aef5fca 100644
--- a/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java
+++ b/src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/util/calendar/BaseCalendar.java b/src/java.base/share/classes/sun/util/calendar/BaseCalendar.java
index f47cde8c98a..7896069255e 100644
--- a/src/java.base/share/classes/sun/util/calendar/BaseCalendar.java
+++ b/src/java.base/share/classes/sun/util/calendar/BaseCalendar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/util/calendar/CalendarDate.java b/src/java.base/share/classes/sun/util/calendar/CalendarDate.java
index aa5653e4f3a..83023388f3a 100644
--- a/src/java.base/share/classes/sun/util/calendar/CalendarDate.java
+++ b/src/java.base/share/classes/sun/util/calendar/CalendarDate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/classes/sun/util/calendar/CalendarSystem.java b/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
index 1ed1df27274..f3183c98229 100644
--- a/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
+++ b/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/man/java.md b/src/java.base/share/man/java.md
index f6b7fd44917..0beb5bf935c 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -2895,6 +2895,12 @@ when they're used.
396](https://openjdk.org/jeps/396) and made obsolete in JDK 17
by [JEP 403](https://openjdk.org/jeps/403).
+## Removed Java Options
+
+These `java` options have been removed in JDK @@VERSION_SPECIFICATION@@ and using them results in an error of:
+
+> `Unrecognized VM option` *option-name*
+
`-XX:RTMAbortRatio=`*abort\_ratio*
: Specifies the RTM abort ratio is specified as a percentage (%) of all
executed RTM transactions. If a number of aborted transactions becomes
@@ -2954,58 +2960,10 @@ when they're used.
processors, which forces them to read from main memory instead of their
cache.
-## Removed Java Options
-
-These `java` options have been removed in JDK @@VERSION_SPECIFICATION@@ and using them results in an error of:
-
-> `Unrecognized VM option` *option-name*
-
-`-XX:InitialRAMFraction=`*ratio*
-: Sets the initial amount of memory that the JVM may use for the Java heap
- before applying ergonomics heuristics as a ratio of the maximum amount
- determined as described in the `-XX:MaxRAM` option. The default value is
- 64.
-
- Use the option `-XX:InitialRAMPercentage` instead.
-
-`-XX:MaxRAMFraction=`*ratio*
-: Sets the maximum amount of memory that the JVM may use for the Java heap
- before applying ergonomics heuristics as a fraction of the maximum amount
- determined as described in the `-XX:MaxRAM` option. The default value is 4.
-
- Specifying this option disables automatic use of compressed oops if
- the combined result of this and other options influencing the maximum amount
- of memory is larger than the range of memory addressable by compressed oops.
- See `-XX:UseCompressedOops` for further information about compressed oops.
-
- Use the option `-XX:MaxRAMPercentage` instead.
-
-`-XX:MinRAMFraction=`*ratio*
-: Sets the maximum amount of memory that the JVM may use for the Java heap
- before applying ergonomics heuristics as a fraction of the maximum amount
- determined as described in the `-XX:MaxRAM` option for small heaps. A small
- heap is a heap of approximately 125 MB. The default value is 2.
-
- Use the option `-XX:MinRAMPercentage` instead.
-
-`-XX:+ScavengeBeforeFullGC`
-: Enables GC of the young generation before each full GC. This option is
- enabled by default. It is recommended that you *don't* disable it, because
- scavenging the young generation before a full GC can reduce the number of
- objects reachable from the old generation space into the young generation
- space. To disable GC of the young generation before each full GC, specify
- the option `-XX:-ScavengeBeforeFullGC`.
-
-`-Xfuture`
-: Enables strict class-file format checks that enforce close conformance to
- the class-file format specification. Developers should use this flag when
- developing new code. Stricter checks may become the default in future
- releases.
-
- Use the option `-Xverify:all` instead.
-
For the lists and descriptions of options removed in previous releases see the *Removed Java Options* section in:
+- [The `java` Command, Release 24](https://docs.oracle.com/en/java/javase/24/docs/specs/man/java.html)
+
- [The `java` Command, Release 23](https://docs.oracle.com/en/java/javase/23/docs/specs/man/java.html)
- [The `java` Command, Release 22](https://docs.oracle.com/en/java/javase/22/docs/specs/man/java.html)
diff --git a/src/java.base/share/native/libjava/Class.c b/src/java.base/share/native/libjava/Class.c
index 5c144703703..af761398f0f 100644
--- a/src/java.base/share/native/libjava/Class.c
+++ b/src/java.base/share/native/libjava/Class.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/native/libjava/PhantomReference.c b/src/java.base/share/native/libjava/PhantomReference.c
index 54d4b7681dd..d90598be7e5 100644
--- a/src/java.base/share/native/libjava/PhantomReference.c
+++ b/src/java.base/share/native/libjava/PhantomReference.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/native/libjava/ub.h b/src/java.base/share/native/libjava/ub.h
index cf7f491ca45..d6e0cac3bea 100644
--- a/src/java.base/share/native/libjava/ub.h
+++ b/src/java.base/share/native/libjava/ub.h
@@ -5,7 +5,9 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/src/java.base/share/native/libjimage/jimage.cpp b/src/java.base/share/native/libjimage/jimage.cpp
index 40625b4ecfe..7b5eacd1fcb 100644
--- a/src/java.base/share/native/libjimage/jimage.cpp
+++ b/src/java.base/share/native/libjimage/jimage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java.base/share/native/libjli/args.c b/src/java.base/share/native/libjli/args.c
index 1e9b48730a9..54b31c8ecb0 100644
--- a/src/java.base/share/native/libjli/args.c
+++ b/src/java.base/share/native/libjli/args.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/share/native/libverify/check_code.c b/src/java.base/share/native/libverify/check_code.c
index d1ebd3d5b94..7266ac8f93c 100644
--- a/src/java.base/share/native/libverify/check_code.c
+++ b/src/java.base/share/native/libverify/check_code.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/unix/classes/sun/net/sdp/SdpProvider.java b/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java
index 9c1b6b6ef9a..f2ad2717fb6 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/unix/classes/sun/nio/ch/InheritedChannel.java b/src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java
index d0cab80c664..06d5ce47c15 100644
--- a/src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java
+++ b/src/java.base/unix/classes/sun/nio/ch/InheritedChannel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/unix/classes/sun/nio/ch/UnixDomainSocketsUtil.java b/src/java.base/unix/classes/sun/nio/ch/UnixDomainSocketsUtil.java
index f3f6499871e..63f5c4e44ee 100644
--- a/src/java.base/unix/classes/sun/nio/ch/UnixDomainSocketsUtil.java
+++ b/src/java.base/unix/classes/sun/nio/ch/UnixDomainSocketsUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/unix/native/jspawnhelper/jspawnhelper.c b/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
index 1b4236b2150..de85d917811 100644
--- a/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
+++ b/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.base/unix/native/libjli/java_md.h b/src/java.base/unix/native/libjli/java_md.h
index ef0740b18f0..eb5a66a8489 100644
--- a/src/java.base/unix/native/libjli/java_md.h
+++ b/src/java.base/unix/native/libjli/java_md.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
index f228f1a4da1..3a18834a567 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c b/src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c
index bbfb5ae42f9..88eb3cbec2d 100644
--- a/src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c
+++ b/src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
index d7a3f1115b5..d0dcb5df182 100644
--- a/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
index 96193b5f734..f566ae94368 100644
--- a/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
index d6c051c17ab..2cf3df3ce2a 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/eawt/Application.java b/src/java.desktop/macosx/classes/com/apple/eawt/Application.java
index d9f01f75dd9..11c34ff7c5c 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/Application.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/Application.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/eio/FileManager.java b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
index 7ace8d90c7c..8bc47f66efb 100644
--- a/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
+++ b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java
index 9b0981aa8b2..3c1b147d1ea 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -189,20 +189,25 @@ protected synchronized void damage(final Rectangle r) {
// intersection of the caret rectangle and the component less the border, if any.
final Rectangle caretRect = new Rectangle(x, y, width, height);
final Border border = getComponent().getBorder();
- if (border != null) {
- final Rectangle alloc = getComponent().getBounds();
- alloc.x = alloc.y = 0;
+ final Rectangle alloc = getComponent().getBounds();
+ alloc.x = alloc.y = 0;
+ if (border != null && border.isBorderOpaque()) {
final Insets borderInsets = border.getBorderInsets(getComponent());
alloc.x += borderInsets.left;
alloc.y += borderInsets.top;
alloc.width -= borderInsets.left + borderInsets.right;
alloc.height -= borderInsets.top + borderInsets.bottom;
Rectangle2D.intersect(caretRect, alloc, caretRect);
+ x = caretRect.x;
+ y = caretRect.y;
+ width = Math.max(caretRect.width, 1);
+ height = Math.max(caretRect.height, 1);
+ } else {
+ x = alloc.x;
+ y = alloc.y;
+ width = alloc.width;
+ height = alloc.height;
}
- x = caretRect.x;
- y = caretRect.y;
- width = Math.max(caretRect.width, 1);
- height = Math.max(caretRect.height, 1);
repaint();
}
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java
index 9cf3b920f91..2d6d965134c 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
index 60bb3da9f87..f9779afdf47 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
index 1c9ad2c929d..070fb93b68d 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
index ee813fc7104..baa83c4390b 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
index 51b02a7f5d4..32479fc4854 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
index d07e4992094..5bb3dbf0953 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java
index ef4e4c5707a..d413d348daf 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
index bc7124aa2ad..3c09758e87f 100644
--- a/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java
index bdb36a90899..bb44ca0f26d 100644
--- a/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java
+++ b/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java b/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
index 571bc5c5479..728ee39a092 100644
--- a/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
+++ b/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/font/CFontManager.java b/src/java.desktop/macosx/classes/sun/font/CFontManager.java
index f9455a6d102..baa7643d829 100644
--- a/src/java.desktop/macosx/classes/sun/font/CFontManager.java
+++ b/src/java.desktop/macosx/classes/sun/font/CFontManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/font/CStrike.java b/src/java.desktop/macosx/classes/sun/font/CStrike.java
index b0131711ca5..323c6e86a72 100644
--- a/src/java.desktop/macosx/classes/sun/font/CStrike.java
+++ b/src/java.desktop/macosx/classes/sun/font/CStrike.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java b/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java
index 033b9ad8362..f2fb23f0a61 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
index f3867ce88c1..82adac72c03 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java
index 7970aa919f1..85f9023eada 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java
index edee1157806..8dd2557743e 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
index f59d41b6b83..ee9b0aec3a0 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java
index b487b14fd79..27fca3d2c70 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
index f8f3d70dd4b..b129e3b97f4 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
index 5c8148a668f..287de9e1801 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
index 4499151d545..c934ec3e234 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
index c36cdd27f3f..fe040d05bb2 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java
index 37ff19c8455..96879952dc3 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java
index 129cc17b515..a9cb119666d 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index 2ce71b1fb95..87b697cd720 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
index 889eaa4aff7..d6dde548c0a 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m
index a3edadc2629..984e80faa66 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m
index ca92d67faf5..7b40de5d135 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m
index 8752af237fe..2777dc1e261 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m
index 0ee8300f72f..b29e7283ef4 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
index 787b90b4b90..32164493f9f 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m
index 7d580216985..cb9de815590 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m
index b02cc818063..ad0d66b28fd 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,7 @@ + (void) addDefaultHelpMenu {
jlong menuBarObject, jlong menuObject, jint index)
{
JNI_COCOA_ENTER(env);
- // Remove the specified item.
+ // Add the specified item.
[((CMenuBar *) jlong_to_ptr(menuBarObject)) javaAddMenu:(CMenu *) jlong_to_ptr(menuObject) atIndex:index];
JNI_COCOA_EXIT(env);
}
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
index f4794d40d31..9333aa8676b 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m
index a1f4afb0929..1350cb1a8dd 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m
index 7b436382065..255eb12d61f 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
index ecdd6e4cdf8..54f036bdc3b 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLSurfaceData.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLSurfaceData.m
index d09e1fc32c7..f6f6635dacc 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLSurfaceData.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLSurfaceData.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libosxapp/JNIUtilities.h b/src/java.desktop/macosx/native/libosxapp/JNIUtilities.h
index fec64e09141..51fba2770d0 100644
--- a/src/java.desktop/macosx/native/libosxapp/JNIUtilities.h
+++ b/src/java.desktop/macosx/native/libosxapp/JNIUtilities.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m b/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
index e74f8ee50fb..dc7fa1dc48d 100644
--- a/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
+++ b/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java b/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java
index 51f84b7b172..16a8463b443 100644
--- a/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java
+++ b/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java
index a8299458757..61e0a4fdb87 100644
--- a/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java
+++ b/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java
index 842afab25dd..cfce84d102a 100644
--- a/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java
+++ b/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java
index 368be094ae3..5095e706b49 100644
--- a/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java
+++ b/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
index 02b41058677..5283cbfce0d 100644
--- a/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
+++ b/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java
index 6578011ccca..162383f8083 100644
--- a/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java
+++ b/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/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 06af183b37c..7cca1e55ef7 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/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 24013fb68ad..3ddf2009efe 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
index f263d47f6c9..b0a818cc3d7 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
index ca9ba7631ca..38f8829bae1 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java
index b40c53ead3d..229c470335b 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
index 629b107f163..4f7d19355c8 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
index be3b8cc60ee..aaeb0243ce7 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java b/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java
index b0afee9871a..2216b45a4b1 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AudioSynthesizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java b/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java
index 77c03c5267d..f86f7ddca8a 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java b/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java
index 15eb82665e6..3a65824bb7d 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java b/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
index 4ed79db13b5..1dc23da2a07 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java b/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
index 91d5c0284b5..e5c0f98c8e0 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/Platform.java b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
index ded8a6496f5..ba03798f1fb 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/Printer.java b/src/java.desktop/share/classes/com/sun/media/sound/Printer.java
index af2c3e11988..6e544cea3d9 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/Printer.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/Printer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
index 6aaddb3e484..4f4b8216486 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
index de2a8b6306b..0581b0ce3ca 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/AWTEvent.java b/src/java.desktop/share/classes/java/awt/AWTEvent.java
index fe9d30deaeb..17c7b775c78 100644
--- a/src/java.desktop/share/classes/java/awt/AWTEvent.java
+++ b/src/java.desktop/share/classes/java/awt/AWTEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/Composite.java b/src/java.desktop/share/classes/java/awt/Composite.java
index 5b024446714..917412d4ae8 100644
--- a/src/java.desktop/share/classes/java/awt/Composite.java
+++ b/src/java.desktop/share/classes/java/awt/Composite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/MenuComponent.java b/src/java.desktop/share/classes/java/awt/MenuComponent.java
index 12a24e92842..facf995416f 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, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/SequencedEvent.java b/src/java.desktop/share/classes/java/awt/SequencedEvent.java
index e04757e195f..13ec5317822 100644
--- a/src/java.desktop/share/classes/java/awt/SequencedEvent.java
+++ b/src/java.desktop/share/classes/java/awt/SequencedEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/SplashScreen.java b/src/java.desktop/share/classes/java/awt/SplashScreen.java
index 737c1a5c080..369f40a3883 100644
--- a/src/java.desktop/share/classes/java/awt/SplashScreen.java
+++ b/src/java.desktop/share/classes/java/awt/SplashScreen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/TextComponent.java b/src/java.desktop/share/classes/java/awt/TextComponent.java
index 20c129795a2..5185646a07e 100644
--- a/src/java.desktop/share/classes/java/awt/TextComponent.java
+++ b/src/java.desktop/share/classes/java/awt/TextComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/WaitDispatchSupport.java b/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java
index 50a66e997f9..71e8b3086a1 100644
--- a/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java
+++ b/src/java.desktop/share/classes/java/awt/WaitDispatchSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html b/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
index 9694c123e50..9e9dc8dcca2 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
@@ -5,7 +5,7 @@
<title>The AWT Focus Subsystem</title>
</head>
<!--
- Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
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/java.desktop/share/classes/java/awt/doc-files/Modality.html b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
index c9aa3e146a3..df8131c0fc5 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
@@ -8,7 +8,7 @@
</style>
</head>
<!--
- Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
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/java.desktop/share/classes/java/awt/event/InputEvent.java b/src/java.desktop/share/classes/java/awt/event/InputEvent.java
index 3da01fd639c..9f1172916df 100644
--- a/src/java.desktop/share/classes/java/awt/event/InputEvent.java
+++ b/src/java.desktop/share/classes/java/awt/event/InputEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/event/NativeLibLoader.java b/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java
index 8b0d46d05e0..e06f9566035 100644
--- a/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java
+++ b/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/font/TextLayout.java b/src/java.desktop/share/classes/java/awt/font/TextLayout.java
index 855097b6a26..74382b4bd83 100644
--- a/src/java.desktop/share/classes/java/awt/font/TextLayout.java
+++ b/src/java.desktop/share/classes/java/awt/font/TextLayout.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/font/TextLine.java b/src/java.desktop/share/classes/java/awt/font/TextLine.java
index 1e4b9c784a6..681fcd90083 100644
--- a/src/java.desktop/share/classes/java/awt/font/TextLine.java
+++ b/src/java.desktop/share/classes/java/awt/font/TextLine.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1021,7 +1021,7 @@ public static TextLineComponent[] createComponentsOnRun(int runStart,
factory.createExtended(font, cm, decorator, startPos, startPos + lmCount);
++numComponents;
- if (numComponents >= components.length) {
+ if (numComponents > components.length) {
components = expandArray(components);
}
@@ -1076,7 +1076,7 @@ public static TextLineComponent[] getComponents(StyledParagraph styledParagraph,
pos = chunkLimit;
++numComponents;
- if (numComponents >= tempComponents.length) {
+ if (numComponents > tempComponents.length) {
tempComponents = expandArray(tempComponents);
}
diff --git a/src/java.desktop/share/classes/java/awt/image/ColorModel.java b/src/java.desktop/share/classes/java/awt/image/ColorModel.java
index b2d568cb09f..446938c3eb0 100644
--- a/src/java.desktop/share/classes/java/awt/image/ColorModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/ColorModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/awt/peer/WindowPeer.java b/src/java.desktop/share/classes/java/awt/peer/WindowPeer.java
index 0c6c991959b..3b5da099ac5 100644
--- a/src/java.desktop/share/classes/java/awt/peer/WindowPeer.java
+++ b/src/java.desktop/share/classes/java/awt/peer/WindowPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
index 6a8a8239663..8e4d3f0577c 100644
--- a/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
+++ b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/beans/EventHandler.java b/src/java.desktop/share/classes/java/beans/EventHandler.java
index 64ae9972f6c..cdda3d940d5 100644
--- a/src/java.desktop/share/classes/java/beans/EventHandler.java
+++ b/src/java.desktop/share/classes/java/beans/EventHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/beans/MetaData.java b/src/java.desktop/share/classes/java/beans/MetaData.java
index e073afbe040..347ac8ad555 100644
--- a/src/java.desktop/share/classes/java/beans/MetaData.java
+++ b/src/java.desktop/share/classes/java/beans/MetaData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/beans/MethodRef.java b/src/java.desktop/share/classes/java/beans/MethodRef.java
index 7ddba2a4461..1f778b2e098 100644
--- a/src/java.desktop/share/classes/java/beans/MethodRef.java
+++ b/src/java.desktop/share/classes/java/beans/MethodRef.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/beans/PropertyDescriptor.java b/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
index 0ce8591ba52..6f5d5d82832 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/beans/SimpleBeanInfo.java b/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java
index 7b6fd131c24..7c4a16c3abb 100644
--- a/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java
+++ b/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/beans/XMLDecoder.java b/src/java.desktop/share/classes/java/beans/XMLDecoder.java
index febba84d2a1..3d5fbd3a8ce 100644
--- a/src/java.desktop/share/classes/java/beans/XMLDecoder.java
+++ b/src/java.desktop/share/classes/java/beans/XMLDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
index ca506fb45f7..509674afddb 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 1014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
index b94d6a85a02..fcaa142577f 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java b/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
index 09fa1eb202b..18a73ebce1f 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
index f74415a8a38..03c9faf6cc4 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
index 0ba532b0b83..3f82cb3d9f7 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/print/DocFlavor.java b/src/java.desktop/share/classes/javax/print/DocFlavor.java
index 9db970cc779..9a5781cc605 100644
--- a/src/java.desktop/share/classes/javax/print/DocFlavor.java
+++ b/src/java.desktop/share/classes/javax/print/DocFlavor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/print/ServiceUI.java b/src/java.desktop/share/classes/javax/print/ServiceUI.java
index bb25207d6a1..d382a83231d 100644
--- a/src/java.desktop/share/classes/javax/print/ServiceUI.java
+++ b/src/java.desktop/share/classes/javax/print/ServiceUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/print/SimpleDoc.java b/src/java.desktop/share/classes/javax/print/SimpleDoc.java
index dd4dfdbe485..486d16ab466 100644
--- a/src/java.desktop/share/classes/javax/print/SimpleDoc.java
+++ b/src/java.desktop/share/classes/javax/print/SimpleDoc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java b/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java
index 5247d4ef861..7d696f14a94 100644
--- a/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java
+++ b/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java b/src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java
index a9c971d82d6..d4ff8581a2d 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/PresentationDirection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* <p>
* <b>IPP Compatibility:</b> This attribute is not an IPP 1.1 attribute; it is
* an attribute in the Production Printing Extension
- * (<a href="ftp://ftp.pwg.org/pub/pwg/standards/temp_archive/pwg5100.3.pdf">
+ * (<a href="https://ftp.pwg.org/pub/pwg/standards/temp_archive/pwg5100.3.pdf">
* PDF</a>) of IPP 1.1. The category name returned by {@code getName()} is the
* IPP attribute name. The enumeration's integer value is the IPP enum value.
* The {@code toString()} method returns the IPP string representation of the
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java b/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java
index 08badfdb492..8e81f0919e0 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/sound/midi/Synthesizer.java b/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java
index 055f3f1066b..60be294140b 100644
--- a/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/AbstractAction.java b/src/java.desktop/share/classes/javax/swing/AbstractAction.java
index 2bf40e810c6..de19b64b9c1 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractAction.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java b/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
index 7c00a03d254..2cb6a0cbb67 100644
--- a/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
+++ b/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/DebugGraphics.java b/src/java.desktop/share/classes/javax/swing/DebugGraphics.java
index 1d6c52c4680..83b44716c04 100644
--- a/src/java.desktop/share/classes/javax/swing/DebugGraphics.java
+++ b/src/java.desktop/share/classes/javax/swing/DebugGraphics.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java b/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
index 628c8f6e68c..6323e2521be 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/JInternalFrame.java b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
index 2f4ab1dcc1d..9611f991025 100644
--- a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index d1fff6a11e0..2749d68a2cc 100644
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/LookAndFeel.java b/src/java.desktop/share/classes/javax/swing/LookAndFeel.java
index 4d31dc9aa02..2981fbb0c51 100644
--- a/src/java.desktop/share/classes/javax/swing/LookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/LookAndFeel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/Popup.java b/src/java.desktop/share/classes/javax/swing/Popup.java
index 3d4329915bb..376a9cdb9ed 100644
--- a/src/java.desktop/share/classes/javax/swing/Popup.java
+++ b/src/java.desktop/share/classes/javax/swing/Popup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/RepaintManager.java b/src/java.desktop/share/classes/javax/swing/RepaintManager.java
index 4799472d44f..8d9548d19e5 100644
--- a/src/java.desktop/share/classes/javax/swing/RepaintManager.java
+++ b/src/java.desktop/share/classes/javax/swing/RepaintManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java b/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
index 1cabf129db1..6bd0400fd8d 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/SwingUtilities.java b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
index f2cecb3d761..c5b5bd051ff 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/SwingWorker.java b/src/java.desktop/share/classes/javax/swing/SwingWorker.java
index a8f1e754aab..75f1700bded 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingWorker.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingWorker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/Timer.java b/src/java.desktop/share/classes/javax/swing/Timer.java
index 46051d92df1..e5f17af2c05 100644
--- a/src/java.desktop/share/classes/javax/swing/Timer.java
+++ b/src/java.desktop/share/classes/javax/swing/Timer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/TimerQueue.java b/src/java.desktop/share/classes/javax/swing/TimerQueue.java
index 44dc0c6e6af..4ef2769652a 100644
--- a/src/java.desktop/share/classes/javax/swing/TimerQueue.java
+++ b/src/java.desktop/share/classes/javax/swing/TimerQueue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/TransferHandler.java b/src/java.desktop/share/classes/javax/swing/TransferHandler.java
index 613d9d570b5..f412314b28f 100644
--- a/src/java.desktop/share/classes/javax/swing/TransferHandler.java
+++ b/src/java.desktop/share/classes/javax/swing/TransferHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/UIDefaults.java b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
index 13bd6e723b4..d59a46dba32 100644
--- a/src/java.desktop/share/classes/javax/swing/UIDefaults.java
+++ b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
index 5664051cf6b..d8d24b5052f 100644
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
index 3ed3b73094b..234a58de4ec 100644
--- a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
+++ b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
index a4c95f02c86..bd2e58d8063 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java
index 2e1d894cc8f..feac7a5986d 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
index c11172d7f4e..1cd4f7e81a2 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
index fab31c78d74..279de053fd6 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
index 28a797f6937..3869da4ee2b 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
index f945f7eac63..77649aba580 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
@@ -148,16 +148,6 @@ public class BasicSliderUI extends SliderUI{
*/
private boolean sameLabelBaselines;
- /**
- * Constructs a {@code BasicSliderUI}.
- *
- * @since 16
- * @deprecated This constructor was exposed erroneously and will be removed in a future release.
- * Use {@link #BasicSliderUI(JSlider)} instead.
- */
- @Deprecated(since = "23", forRemoval = true)
- public BasicSliderUI() {}
-
/**
* Returns the shadow color.
* @return the shadow color
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
index d3b7b4a836c..35fc07de056 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
index 38e8530983a..fc591406c71 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
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/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
index e9ad49c391d..6334c0649bf 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java
index 1808aeeb75f..709ae99fe4d 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
index 1eed3c4ad14..ac688f3ef49 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java
index 2b8c9ae72ba..947244ecda3 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTableUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
index 8b4d7bec2c0..5ffb7ee347b 100644
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/text/AbstractDocument.java b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
index de849476772..e7d6f996cbe 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
index 81edfd1f504..ed502e8da9b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
index a0f6a963926..382872e4f5c 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/text/NumberFormatter.java b/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java
index 8abc78e5ade..e73cb393025 100644
--- a/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/text/html/ObjectView.java b/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java
index bdc73d85c3e..2f635333cb3 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/text/html/default.css b/src/java.desktop/share/classes/javax/swing/text/html/default.css
index 32f54231f46..14c0747c386 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/default.css
+++ b/src/java.desktop/share/classes/javax/swing/text/html/default.css
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/text/html/parser/Element.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
index 6456696e364..cf8ea622c9b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,9 +25,9 @@
package javax.swing.text.html.parser;
-import java.util.Hashtable;
+import java.io.Serializable;
import java.util.BitSet;
-import java.io.*;
+import java.util.Map;
import sun.awt.AppContext;
/**
@@ -41,8 +41,7 @@
* @author Arthur van Hoff
*/
@SuppressWarnings("serial") // Same-version serialization only
-public final
-class Element implements DTDConstants, Serializable {
+public final class Element implements DTDConstants, Serializable {
/**
* The element index
@@ -234,15 +233,12 @@ public AttributeList getAttributeByValue(String value) {
return null;
}
-
- static Hashtable<String, Integer> contentTypes = new Hashtable<String, Integer>();
-
- static {
- contentTypes.put("CDATA", Integer.valueOf(CDATA));
- contentTypes.put("RCDATA", Integer.valueOf(RCDATA));
- contentTypes.put("EMPTY", Integer.valueOf(EMPTY));
- contentTypes.put("ANY", Integer.valueOf(ANY));
- }
+ private static final Map<String, Integer> contentTypes = Map.of(
+ "CDATA", CDATA,
+ "RCDATA", RCDATA,
+ "EMPTY", EMPTY,
+ "ANY", ANY
+ );
/**
* Converts {@code nm} to type. Returns appropriate DTDConstants
@@ -253,7 +249,6 @@ public AttributeList getAttributeByValue(String value) {
* CDATA, RCDATA, EMPTY or ANY, 0 otherwise.
*/
public static int name2type(String nm) {
- Integer val = contentTypes.get(nm);
- return (val != null) ? val.intValue() : 0;
+ return contentTypes.getOrDefault(nm, 0);
}
}
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java
index 0f89e49a171..2d541abc06f 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
index 3afaf828417..5122df19fe0 100644
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/AWTAccessor.java b/src/java.desktop/share/classes/sun/awt/AWTAccessor.java
index db107fc309c..22df71f564d 100644
--- a/src/java.desktop/share/classes/sun/awt/AWTAccessor.java
+++ b/src/java.desktop/share/classes/sun/awt/AWTAccessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/DebugSettings.java b/src/java.desktop/share/classes/sun/awt/DebugSettings.java
index b95ac44ba54..6ff0a5181f8 100644
--- a/src/java.desktop/share/classes/sun/awt/DebugSettings.java
+++ b/src/java.desktop/share/classes/sun/awt/DebugSettings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/EmbeddedFrame.java b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
index e024a6466cb..8c0669fa386 100644
--- a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
+++ b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/FontConfiguration.java b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
index 0054382e8f6..de5dd0f14d2 100644
--- a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
+++ b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/FontDescriptor.java b/src/java.desktop/share/classes/sun/awt/FontDescriptor.java
index 4a16cd8d811..b97c3e6eb58 100644
--- a/src/java.desktop/share/classes/sun/awt/FontDescriptor.java
+++ b/src/java.desktop/share/classes/sun/awt/FontDescriptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/NativeLibLoader.java b/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java
index 4bb49ae0b10..2470b66d189 100644
--- a/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java
+++ b/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/OSInfo.java b/src/java.desktop/share/classes/sun/awt/OSInfo.java
index b278032c45f..decd3e35402 100644
--- a/src/java.desktop/share/classes/sun/awt/OSInfo.java
+++ b/src/java.desktop/share/classes/sun/awt/OSInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java b/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
index 568da951a7d..6c03fa83369 100644
--- a/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
+++ b/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java b/src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java
index fffb3f98a3e..f363c68d663 100644
--- a/src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java
+++ b/src/java.desktop/share/classes/sun/awt/datatransfer/TransferableProxy.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java b/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
index b937fb139a3..d8246a4947c 100644
--- a/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
+++ b/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/im/InputContext.java b/src/java.desktop/share/classes/sun/awt/im/InputContext.java
index 00703eb44c3..5b0d0b96b54 100644
--- a/src/java.desktop/share/classes/sun/awt/im/InputContext.java
+++ b/src/java.desktop/share/classes/sun/awt/im/InputContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/im/InputMethodContext.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java
index fd165a52f72..37c0d84c033 100644
--- a/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java
+++ b/src/java.desktop/share/classes/sun/awt/im/InputMethodContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/im/InputMethodManager.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java
index 3484f7cbebe..0da7dbed6ea 100644
--- a/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java
+++ b/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java b/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java
index 1a76c47692e..85574664f47 100644
--- a/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java
+++ b/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java b/src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java
index ec7efe8ad70..5727d7dd577 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteArrayImageSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/FileImageSource.java b/src/java.desktop/share/classes/sun/awt/image/FileImageSource.java
index 0f4dbff8aac..431cb5e459d 100644
--- a/src/java.desktop/share/classes/sun/awt/image/FileImageSource.java
+++ b/src/java.desktop/share/classes/sun/awt/image/FileImageSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java b/src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java
index e945a9b2b9e..5f5b36b9dd5 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ImageConsumerQueue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/ImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java
index c3691773f6e..de4487cbfda 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/ImageFetcher.java b/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java
index 784f947b8aa..74c7c4d2ce2 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java b/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java
index 685455acccd..1ea5f9e13ea 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/ImageWatched.java b/src/java.desktop/share/classes/sun/awt/image/ImageWatched.java
index c3198ac704b..de9482096d5 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ImageWatched.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ImageWatched.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/ImagingLib.java b/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
index d37afcb7a8b..fb2191c7ffc 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java b/src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java
index 5c672c66098..37b5dadca9a 100644
--- a/src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java
+++ b/src/java.desktop/share/classes/sun/awt/image/InputStreamImageSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java
index eb1023bd694..e9a38cc8582 100644
--- a/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java
+++ b/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java b/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java
index d971bf6e40d..932d4bd221a 100644
--- a/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java
+++ b/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/SurfaceManager.java b/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
index e81af32d05c..9f605eed4e3 100644
--- a/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
+++ b/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/ToolkitImage.java b/src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java
index 0192a822095..437ab5c26ae 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ToolkitImage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/URLImageSource.java b/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java
index ad9caff8639..10e2bcebb20 100644
--- a/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java
+++ b/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java b/src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java
index 88403ca06a3..3f00ff1c697 100644
--- a/src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java
+++ b/src/java.desktop/share/classes/sun/awt/image/VSyncedBSManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/shell/ShellFolder.java b/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
index af1b7c74b59..b829292fd9a 100644
--- a/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
+++ b/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java b/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java
index 10d0b539285..c4967a75dd5 100644
--- a/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java
+++ b/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java b/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java
index c942ec4e8f8..e57bf169275 100644
--- a/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java
+++ b/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java b/src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java
index 6944ba44879..f59a360e380 100644
--- a/src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java
+++ b/src/java.desktop/share/classes/sun/awt/util/ThreadGroupUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/CodePointIterator.java b/src/java.desktop/share/classes/sun/font/CodePointIterator.java
index 31c4bc5c1d4..dad1aed3827 100644
--- a/src/java.desktop/share/classes/sun/font/CodePointIterator.java
+++ b/src/java.desktop/share/classes/sun/font/CodePointIterator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/CreatedFontTracker.java b/src/java.desktop/share/classes/sun/font/CreatedFontTracker.java
index a144f14f4a9..65ab8f29d2b 100644
--- a/src/java.desktop/share/classes/sun/font/CreatedFontTracker.java
+++ b/src/java.desktop/share/classes/sun/font/CreatedFontTracker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/FileFont.java b/src/java.desktop/share/classes/sun/font/FileFont.java
index 47c6ea181f4..5e5ec2fc0a1 100644
--- a/src/java.desktop/share/classes/sun/font/FileFont.java
+++ b/src/java.desktop/share/classes/sun/font/FileFont.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/FileFontStrike.java b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
index e6d07026a55..da291781c68 100644
--- a/src/java.desktop/share/classes/sun/font/FileFontStrike.java
+++ b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java b/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
index e3baf437a8b..df67a40fd14 100644
--- a/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
+++ b/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/FontUtilities.java b/src/java.desktop/share/classes/sun/font/FontUtilities.java
index 30ec4f3db81..014bc3ba832 100644
--- a/src/java.desktop/share/classes/sun/font/FontUtilities.java
+++ b/src/java.desktop/share/classes/sun/font/FontUtilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/GlyphList.java b/src/java.desktop/share/classes/sun/font/GlyphList.java
index df6ca08586c..731c95d775a 100644
--- a/src/java.desktop/share/classes/sun/font/GlyphList.java
+++ b/src/java.desktop/share/classes/sun/font/GlyphList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/HBShaper.java b/src/java.desktop/share/classes/sun/font/HBShaper.java
index 98c40035104..16bfd1ba971 100644
--- a/src/java.desktop/share/classes/sun/font/HBShaper.java
+++ b/src/java.desktop/share/classes/sun/font/HBShaper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/StrikeCache.java b/src/java.desktop/share/classes/sun/font/StrikeCache.java
index c0859c4c0af..2266746e17a 100644
--- a/src/java.desktop/share/classes/sun/font/StrikeCache.java
+++ b/src/java.desktop/share/classes/sun/font/StrikeCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java
index 06dc4a90820..ef34f9d7839 100644
--- a/src/java.desktop/share/classes/sun/font/SunFontManager.java
+++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/font/TrueTypeFont.java b/src/java.desktop/share/classes/sun/font/TrueTypeFont.java
index 8b7f9b95f5c..97174b1a2fd 100644
--- a/src/java.desktop/share/classes/sun/font/TrueTypeFont.java
+++ b/src/java.desktop/share/classes/sun/font/TrueTypeFont.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/NullSurfaceData.java b/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
index 827170e488d..71da74ce951 100644
--- a/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
+++ b/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java b/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
index 5cd8f11ecdb..52753cb771e 100644
--- a/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
+++ b/src/java.desktop/share/classes/sun/java2d/SunGraphicsEnvironment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/SurfaceData.java b/src/java.desktop/share/classes/sun/java2d/SurfaceData.java
index cd39e48d90e..b23541bdaaa 100644
--- a/src/java.desktop/share/classes/sun/java2d/SurfaceData.java
+++ b/src/java.desktop/share/classes/sun/java2d/SurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java b/src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java
index ba4d6caf44c..3110a182d75 100644
--- a/src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java
+++ b/src/java.desktop/share/classes/sun/java2d/SurfaceDataProxy.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java b/src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java
index 8aba1056616..e4e38b7f219 100644
--- a/src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java
+++ b/src/java.desktop/share/classes/sun/java2d/cmm/CMSManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
index 3a7db37329e..63a1359323f 100644
--- a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
+++ b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
index 8fd97626f04..519a9d7c9b3 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
index dea2f3f2be7..35c51e17899 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java
index 65122cae2a3..35f87a0bd63 100644
--- a/src/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/marlin/MarlinUtils.java b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinUtils.java
index 49f5ab613a8..f1427c5c7da 100644
--- a/src/java.desktop/share/classes/sun/java2d/marlin/MarlinUtils.java
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java b/src/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java
index 131f63afa65..3ae5d2b5c36 100644
--- a/src/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/RendererStats.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java
index 8427bcd1a4f..6e72fdb9d20 100644
--- a/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java
+++ b/src/java.desktop/share/classes/sun/java2d/opengl/OGLRenderQueue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java
index 501399c35a9..4341450ba3c 100644
--- a/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java
+++ b/src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java b/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java
index e6a5be7ca3b..14f55664cb8 100644
--- a/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
index a0f68a713aa..eb981c92a12 100644
--- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/print/PSStreamPrintJob.java b/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java
index e9e9aa142b2..dcafdb86460 100644
--- a/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java
+++ b/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/print/PrintJob2D.java b/src/java.desktop/share/classes/sun/print/PrintJob2D.java
index fb0fdbb17c5..373cc7c8b2b 100644
--- a/src/java.desktop/share/classes/sun/print/PrintJob2D.java
+++ b/src/java.desktop/share/classes/sun/print/PrintJob2D.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/print/ServiceNotifier.java b/src/java.desktop/share/classes/sun/print/ServiceNotifier.java
index cac06750330..f42489debc7 100644
--- a/src/java.desktop/share/classes/sun/print/ServiceNotifier.java
+++ b/src/java.desktop/share/classes/sun/print/ServiceNotifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/print/resources/serviceui.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui.properties
index 39fd3cd8d8e..0207875d634 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_de.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties
index a50c78d060d..b87b91aa91b 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_de.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_es.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties
index 170e7b0b91f..ab58b7ed278 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_es.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties
index 8222bf21e8d..286e8c1839d 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_fr.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_it.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties
index bac068e46ac..07f9a08b0fa 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_it.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties
index ee8e591d15a..3f889518f43 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_ja.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties
index d737b987db1..79df6fa5c2c 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_ko.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties
index 5f157b9f5f7..9b0d7062bdc 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_pt_BR.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties
index 8d84d54dc28..1d9e5ad5f02 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_sv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties
index cdc2bb5541f..60afdc572c2 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties
index de600e74ec6..880ef4f8f96 100644
--- a/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties
+++ b/src/java.desktop/share/classes/sun/print/resources/serviceui_zh_TW.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java b/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java
index cd54d40bd0a..9c0e2d1792e 100644
--- a/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java
+++ b/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java b/src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java
index 3932f7f52a1..efdf40312a6 100644
--- a/src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java
+++ b/src/java.desktop/share/classes/sun/swing/plaf/GTKKeybindings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java b/src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java
index c4d3f286959..339cd7f67fa 100644
--- a/src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java
+++ b/src/java.desktop/share/classes/sun/swing/plaf/WindowsKeybindings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/conf/psfontj2d.properties b/src/java.desktop/share/conf/psfontj2d.properties
index 0feee66de02..9efe8864428 100644
--- a/src/java.desktop/share/conf/psfontj2d.properties
+++ b/src/java.desktop/share/conf/psfontj2d.properties
@@ -1,6 +1,6 @@
#
#
-# Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c b/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c
index 36163e885ed..f7b0f85fe06 100644
--- a/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c
+++ b/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libawt/awt/image/awt_parseImage.c b/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c
index 29690b9c9a7..72677b0bf48 100644
--- a/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c
+++ b/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c b/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c
index b6170814223..ae86b309465 100644
--- a/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c
+++ b/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libawt/java2d/SurfaceData.c b/src/java.desktop/share/native/libawt/java2d/SurfaceData.c
index fbed597096b..8abacd867c1 100644
--- a/src/java.desktop/share/native/libawt/java2d/SurfaceData.c
+++ b/src/java.desktop/share/native/libawt/java2d/SurfaceData.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libawt/java2d/loops/IntRgb.c b/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c
index aec11d17c89..e3c94da5ed2 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libfontmanager/hb-jdk-font.cc b/src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc
index caeca3e6346..6e370dec182 100644
--- a/src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc
+++ b/src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libfontmanager/hb-jdk-p.h b/src/java.desktop/share/native/libfontmanager/hb-jdk-p.h
index c022e964e77..890e3cabdd9 100644
--- a/src/java.desktop/share/native/libfontmanager/hb-jdk-p.h
+++ b/src/java.desktop/share/native/libfontmanager/hb-jdk-p.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libfontmanager/sunFont.c b/src/java.desktop/share/native/libfontmanager/sunFont.c
index 6029dc02d89..e6082b69416 100644
--- a/src/java.desktop/share/native/libfontmanager/sunFont.c
+++ b/src/java.desktop/share/native/libfontmanager/sunFont.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libjavajpeg/jpegdecoder.c b/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
index 889c7a9c0f6..0195e1b178c 100644
--- a/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
+++ b/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libjsound/PortMixer.c b/src/java.desktop/share/native/libjsound/PortMixer.c
index 23f08d8dca6..f71b1c88657 100644
--- a/src/java.desktop/share/native/libjsound/PortMixer.c
+++ b/src/java.desktop/share/native/libjsound/PortMixer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c b/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
index 259afd94acb..32939b5ad88 100644
--- a/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
+++ b/src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java b/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java
index 9ab68a4ff44..4e379a9e9e6 100644
--- a/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java
+++ b/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
index 641e2f86c02..b73c94ac86d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/Native.java b/src/java.desktop/unix/classes/sun/awt/X11/Native.java
index 773668ff53a..29490103f41 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/Native.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/Native.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
index 5bc605cd82b..670106fe05c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XClipboard.java b/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
index 3a36c3195a8..c99d2c9f1a6 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
index 49515bb2031..5be6089f243 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
index 57e06cf94de..97fa79c96f3 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java
index b4cddacf9a1..e7c2fb8d807 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java b/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java
index 1dfaa4b8d4d..96f7addfba7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandlerUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
index 596bc493f00..98caf9f43cf 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
index 400f8168f72..c1466a6a78c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
index 010c5aeff5a..fa0bdbed68c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
index bd05dd578c9..c13400f09f5 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XTaskbarPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTaskbarPeer.java
index 73668bf591c..7f0629e101e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTaskbarPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTaskbarPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XToolkit.java b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
index bc6275aaacc..3a7ea1e40ed 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
index c3711010b7c..330f860efea 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
index 3ade95f5870..3c5dff2ec1c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
index 573d98390b4..a37e82d2273 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
index 804107d9820..76b1d177955 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
index c6b9d4ef7ad..ba06574cdd7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
index eed50962f0d..b17b4c45644 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
index 9d42e2c92da..82490e88a99 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
index f05419feef4..ef6bf091860 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java b/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
index 8f276954d6d..48fb20c69ba 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/font/FcFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
index 0e9b612301c..bfd8acf7739 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
index cd090eab52d..94733316fbd 100644
--- a/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
+++ b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
index ce7a8de5a8e..96b0dc49183 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
index 88c44369abf..862baf6ce4f 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
index 0d10e85f607..20f09ed5de6 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
index 82ceeeb5350..fb2c8ad4801 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
index 66adccea41e..f4dcee17f7a 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/print/CUPSPrinter.java b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
index 62c43316065..11e0b45014e 100644
--- a/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
+++ b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/print/IPPPrintService.java b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
index 06533781571..53089401e33 100644
--- a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
index e91ef99ab37..3eb02bc7f23 100644
--- a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
+++ b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
index b8c455a7d00..ffb3c68ecb7 100644
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/classes/sun/print/UnixPrintService.java b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
index 8185abc6005..a5c81362485 100644
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/common/awt/CUPSfuncs.c b/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
index 173d44d96c8..7594bd2c62a 100644
--- a/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
+++ b/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/common/awt/X11Color.c b/src/java.desktop/unix/native/common/awt/X11Color.c
index 2d3fd480914..738a7bd094e 100644
--- a/src/java.desktop/unix/native/common/awt/X11Color.c
+++ b/src/java.desktop/unix/native/common/awt/X11Color.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c
index 2da0ec0328b..95499cfc948 100644
--- a/src/java.desktop/unix/native/common/awt/fontpath.c
+++ b/src/java.desktop/unix/native/common/awt/fontpath.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c b/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c
index 521b7cfef3a..0d352c36bbe 100644
--- a/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c
+++ b/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/common/java2d/x11/X11Renderer.c b/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c
index 216fe8090ff..f01986ea983 100644
--- a/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c
+++ b/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c b/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c
index e62ccff4653..2349ad3dcfd 100644
--- a/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c
+++ b/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c b/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c
index d50ef00f945..8471a2ae280 100644
--- a/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c
+++ b/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
index 51c425c8c59..fdb2bbb3ab9 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
index 94468d548ef..7bfb858616a 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/libawt_xawt/awt/awt_util.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
index 67b1ad2bc45..cbcf92be078 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/libawt_xawt/awt/multiVis.c b/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c
index 93c1f4d0c1a..d1b89a0b741 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.c b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.c
index 45c1b55942f..92342aa13be 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
index a8fdbaf7a50..a71b3b8367f 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
index bba5f8dc31e..f8f5e3628fb 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/Win32FontManager.java b/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
index 52042a600f9..c2532ff38b3 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
index f627978282d..6e740de6a9b 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
index 95aa5b302f0..973eb916a5c 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java b/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
index b31685294ba..6b9d54aaa28 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
index a6294e05ba9..e5db1d432cf 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java
index 60f3726249e..1db4bd7e5d1 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WFileDialogPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
index 3a736e5c519..43d4d2b907a 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java b/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
index aef078b950f..57848c01a0a 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
index 970b317a8a8..54e69801324 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java
index e725e7f3754..108706bb2fb 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/WToolkit.java b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
index 1ede804d449..120f67dad19 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
index af1b77198c7..997db36beac 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
index fd9112e08f1..a1afb5cd4c4 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
index df4d196c392..c8e082b59d6 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
index b06db9ee01b..768f2df08ad 100644
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
index 68ac0fd3ac0..52e0d47c55d 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java b/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
index da13c6b49fc..5bf2ba3227f 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
index aaaae37c6f5..4dbcf3a4701 100644
--- a/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
+++ b/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/print/Win32PrintJob.java b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
index 008641418d2..f8ee2d3db0b 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/classes/sun/print/Win32PrintService.java b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
index 4706e05a8ff..7d85755bf0c 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp
index 39f58d6340f..d7eb4efd37a 100644
--- a/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp
+++ b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp
index 1e3baa1c686..38d9e1ecc58 100644
--- a/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp
+++ b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt.rc b/src/java.desktop/windows/native/libawt/windows/awt.rc
index 36981f35f67..2c52ac94fed 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt.rc
+++ b/src/java.desktop/windows/native/libawt/windows/awt.rc
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
// 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/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp
index 55a0b0f4207..ad2653ebd6f 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt_List.cpp b/src/java.desktop/windows/native/libawt/windows/awt_List.cpp
index 7ffbb5c6a85..80a5f73ab1e 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_List.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_List.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp
index a8a20789eec..e391f3e4bdd 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt_PrintControl.h b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h
index d3a77babb2e..645c7ee0465 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h b/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h
index 669b1e0cbe8..2fe5529a70f 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp b/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp
index 81d44b9d760..9a814e97d52 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt_TextComponent.h b/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h
index 6bc81e3ef45..29499822e59 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt_Window.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
index 9eb6cb51c7b..f632da02162 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.desktop/windows/native/libawt/windows/awt_Window.h b/src/java.desktop/windows/native/libawt/windows/awt_Window.h
index d683a6cc7db..f1eacc35a5e 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Window.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Window.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
index fa2a4c9add3..f4aff847041 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
index f5925a25d35..6ba3da9e34c 100644
--- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
+++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.management/share/classes/javax/management/MBeanServerDelegate.java b/src/java.management/share/classes/javax/management/MBeanServerDelegate.java
index 6e089f4164d..f2346a04d5e 100644
--- a/src/java.management/share/classes/javax/management/MBeanServerDelegate.java
+++ b/src/java.management/share/classes/javax/management/MBeanServerDelegate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java
index c356e4a7522..9d1e9e3979e 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java
index 8c796193015..db4a6b0c50a 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.net.http/share/classes/jdk/internal/net/http/common/HeaderDecoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/HeaderDecoder.java
index d81f52e6630..92423314553 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/HeaderDecoder.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/HeaderDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.net.http/share/classes/jdk/internal/net/http/hpack/DecodingCallback.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/DecodingCallback.java
index 228f9bf0206..5ea3274e5bc 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/hpack/DecodingCallback.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/DecodingCallback.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.rmi/share/man/rmiregistry.md b/src/java.rmi/share/man/rmiregistry.md
index 48c426cfbdc..c5b305871c2 100644
--- a/src/java.rmi/share/man/rmiregistry.md
+++ b/src/java.rmi/share/man/rmiregistry.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.se/share/classes/module-info.java b/src/java.se/share/classes/module-info.java
index 9a2704660b7..0fa5a561dec 100644
--- a/src/java.se/share/classes/module-info.java
+++ b/src/java.se/share/classes/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m b/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m
index 43cab418e17..4cf04c26328 100644
--- a/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m
+++ b/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.security.jgss/windows/man/kinit.md b/src/java.security.jgss/windows/man/kinit.md
index 03605667ae9..130bf7b007a 100644
--- a/src/java.security.jgss/windows/man/kinit.md
+++ b/src/java.security.jgss/windows/man/kinit.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.security.jgss/windows/man/klist.md b/src/java.security.jgss/windows/man/klist.md
index be9e26abe0f..67c84e65dec 100644
--- a/src/java.security.jgss/windows/man/klist.md
+++ b/src/java.security.jgss/windows/man/klist.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.security.jgss/windows/man/ktab.md b/src/java.security.jgss/windows/man/ktab.md
index ac8a6d4a0ec..d6817ab81cf 100644
--- a/src/java.security.jgss/windows/man/ktab.md
+++ b/src/java.security.jgss/windows/man/ktab.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java
index 5535fdd41c9..c9938ec675d 100644
--- a/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java
+++ b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
index 93d213bc149..ac993133db8 100644
--- a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+++ b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java
index 01cddcf8aa3..82404f3741f 100644
--- a/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java
+++ b/src/java.smartcardio/windows/classes/sun/security/smartcardio/PlatformPCSC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties
index 9f30c93e1be..a3b810fb8f1 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
index 1cccbe37749..f0e85b3b1c0 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
index 3793ed85288..618ad8c9a52 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
index 48dc5e0d12d..9cae84a4019 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
index 7ab025d8c82..1ac19156b14 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
index e2f906f74cd..726b8dc5de5 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
index 9f01b1051aa..dd030c0d838 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
index 4f0d1369181..7496749670c 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
index 3bc14d48f9f..7e3a21ac2c2 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
index d9b4052f00a..b5b483cfffb 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
index d1539384bd9..f6c3584be2c 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java
index e5f25f8a168..73bb39eba98 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -659,13 +659,12 @@ public void endElement(String uri, String lName, String qName) throws SAXExcepti
case PropClassTag:
//Added the handling for Class tags to take care of maps
//Makes an entry into the map upon end of class tag
- try{
- typeMap.put(Key_map,sun.reflect.misc.ReflectUtil.forName(Value_map));
-
- }catch(ClassNotFoundException ex) {
- throw new SAXException(MessageFormat.format(resBundle.handleGetObject("xmlrch.errmap").toString(), ex.getMessage()));
- }
- break;
+ try {
+ typeMap.put(Key_map, Class.forName(Value_map, true, null));
+ } catch (ClassNotFoundException ex) {
+ throw new SAXException(MessageFormat.format(resBundle.handleGetObject("xmlrch.errmap").toString(), ex.getMessage()));
+ }
+ break;
case MapTag:
//Added the handling for Map to take set the typeMap
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
index 4d190c073c5..3a291526ca0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
index deff1f741a0..c337c72af53 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
index 879fcf5a866..b81739e46fd 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
index b702d099284..90c61541038 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
index f72410c4cfc..5b8c87cb51b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
index eb03257c119..f3a488928c7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
index 04612301ad9..77ca15d88f1 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
index 65067a9e857..9171a16b69f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
index 10dbcb494dd..66e2692057e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
index 7f5078f6d26..78223a0a47e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
index 7aab380d739..c9459ae0efc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
index 847074319d7..d0bfd1eba0f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
index 7c513b73413..4be053931de 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
index 0e12106d26b..66d8a539897 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
index 556ab78c3e8..14498314a5b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
index 4fbd4e2dbb3..d9bba9ce159 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
index a9aeadb7891..ca12d337604 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
index d3819a3c64e..8a2db17c0c7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
index e51be5c17ab..b9711a32347 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
index 146a4abd170..25182a06a3c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
#
#
# Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
index 9f24c42b110..1a915f243fb 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
#
#
# Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
index 00bced117f6..bbfbb9c26f5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
#
#
# Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
index ffe36a06f35..af7fd26aa38 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
#
#
# Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
index 9b5e412696b..2b0da4402be 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
index a955e5d11f3..89e8f2d1acf 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
index 04578cdc314..f9f544b583c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
index 91949ed6c9c..192e1af82bf 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
index 563091b4bd0..fc1da96df23 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
index 6cfcddc1392..d0ffa141c67 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
index 6f9ae6734cc..fa9b1ef35c8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
index 256a737cf7d..5bbdc69480c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
index 553046c3725..475f51ffea5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
index 3580222cffa..e7e46799e82 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
index 4ee319e06e9..ec6cd7873bb 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
index f00c5353de8..761d746fee1 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
index 08cbf0e9b4a..b12910d02f9 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java
index 0ba0c5123f2..5dfd04a07b7 100644
--- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java
+++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java
index 9ef9482e3ec..4ab0bad4d0c 100644
--- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java
+++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/EventQueueMonitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java
index f6f3bb686b1..41c03295584 100644
--- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java
+++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java
index e6792b3ef10..1f5b5b215fa 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.accessibility/windows/man/jabswitch.md b/src/jdk.accessibility/windows/man/jabswitch.md
index 8dfdd6f2737..11969b30a9b 100644
--- a/src/jdk.accessibility/windows/man/jabswitch.md
+++ b/src/jdk.accessibility/windows/man/jabswitch.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.accessibility/windows/man/jaccessinspector.md b/src/jdk.accessibility/windows/man/jaccessinspector.md
index 17f44cef358..d824bd3bd73 100644
--- a/src/jdk.accessibility/windows/man/jaccessinspector.md
+++ b/src/jdk.accessibility/windows/man/jaccessinspector.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.accessibility/windows/man/jaccesswalker.md b/src/jdk.accessibility/windows/man/jaccesswalker.md
index f688ae57aee..0a1c6b18ecd 100644
--- a/src/jdk.accessibility/windows/man/jaccesswalker.md
+++ b/src/jdk.accessibility/windows/man/jaccesswalker.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
index 9f9f96a9416..6df51d04b0a 100644
--- a/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
index 19104d49014..53f526246ef 100644
--- a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
index 23c15ad06e1..f344be99ccb 100644
--- a/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
index 36ab4a145f9..886da9fd6ba 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
@@ -1018,7 +1018,11 @@ private Attribute.TypeCompound toTypeCompound(Attribute.Compound a, TypeAnnotati
if (!invocation.typeargs.contains(tree)) {
return TypeAnnotationPosition.unknown;
}
- MethodSymbol exsym = (MethodSymbol) TreeInfo.symbol(invocation.getMethodSelect());
+ Symbol exsym = TreeInfo.symbol(invocation.getMethodSelect());
+ if (exsym.type.isErroneous()) {
+ // bail out, don't deal with erroneous types which would be reported anyways
+ return TypeAnnotationPosition.unknown;
+ }
final int type_index = invocation.typeargs.indexOf(tree);
if (exsym == null) {
throw new AssertionError("could not determine symbol for {" + invocation + "}");
diff --git a/src/jdk.compiler/share/data/symbols/java.base-O.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-O.sym.txt
index 8ce4d000efa..dae8317f73b 100644
--- a/src/jdk.compiler/share/data/symbols/java.base-O.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.base-O.sym.txt
@@ -27,7 +27,7 @@
# ##########################################################
#
module name java.base
-header exports java/io,java/lang,java/lang/annotation,java/lang/classfile,java/lang/classfile/attribute,java/lang/classfile/components,java/lang/classfile/constantpool,java/lang/classfile/instruction,java/lang/constant,java/lang/foreign,java/lang/invoke,java/lang/module,java/lang/ref,java/lang/reflect,java/lang/runtime,java/math,java/net,java/net/spi,java/nio,java/nio/channels,java/nio/channels/spi,java/nio/charset,java/nio/charset/spi,java/nio/file,java/nio/file/attribute,java/nio/file/spi,java/security,java/security/cert,java/security/interfaces,java/security/spec,java/text,java/text/spi,java/time,java/time/chrono,java/time/format,java/time/temporal,java/time/zone,java/util,java/util/concurrent,java/util/concurrent/atomic,java/util/concurrent/locks,java/util/function,java/util/jar,java/util/random,java/util/regex,java/util/spi,java/util/stream,java/util/zip,javax/crypto,javax/crypto/interfaces,javax/crypto/spec,javax/net,javax/net/ssl,javax/security/auth,javax/security/auth/callback,javax/security/auth/login,javax/security/auth/spi,javax/security/auth/x500,javax/security/cert,jdk/internal/event[jdk.jfr],jdk/internal/javac[java.compiler\u005C;u002C;java.desktop\u005C;u002C;java.se\u005C;u002C;jdk.compiler\u005C;u002C;jdk.incubator.vector\u005C;u002C;jdk.jartool\u005C;u002C;jdk.jdeps\u005C;u002C;jdk.jfr\u005C;u002C;jdk.jlink\u005C;u002C;jdk.jshell],jdk/internal/vm/vector[jdk.incubator.vector] extraModulePackages jdk/internal/access/foreign,jdk/internal/classfile/impl,jdk/internal/constant,jdk/internal/foreign/abi,jdk/internal/foreign/abi/aarch64/linux,jdk/internal/foreign/abi/aarch64/macos,jdk/internal/foreign/abi/aarch64/windows,jdk/internal/foreign/abi/fallback,jdk/internal/foreign/abi/ppc64/aix,jdk/internal/foreign/abi/ppc64/linux,jdk/internal/foreign/abi/riscv64/linux,jdk/internal/foreign/abi/s390/linux,jdk/internal/foreign/abi/x64/sysv,jdk/internal/foreign/abi/x64/windows,jdk/internal/foreign/layout,sun/nio/ch,sun/net,jdk/internal/foreign,jdk/internal/foreign,sun/net,sun/nio/ch uses java/lang/System$LoggerFinder,java/net/ContentHandlerFactory,java/net/spi/InetAddressResolverProvider,java/net/spi/URLStreamHandlerProvider,java/nio/channels/spi/AsynchronousChannelProvider,java/nio/channels/spi/SelectorProvider,java/nio/charset/spi/CharsetProvider,java/nio/file/spi/FileSystemProvider,java/nio/file/spi/FileTypeDetector,java/security/Provider,java/text/spi/BreakIteratorProvider,java/text/spi/CollatorProvider,java/text/spi/DateFormatProvider,java/text/spi/DateFormatSymbolsProvider,java/text/spi/DecimalFormatSymbolsProvider,java/text/spi/NumberFormatProvider,java/time/chrono/AbstractChronology,java/time/chrono/Chronology,java/time/zone/ZoneRulesProvider,java/util/spi/CalendarDataProvider,java/util/spi/CalendarNameProvider,java/util/spi/CurrencyNameProvider,java/util/spi/LocaleNameProvider,java/util/spi/ResourceBundleControlProvider,java/util/spi/ResourceBundleProvider,java/util/spi/TimeZoneNameProvider,java/util/spi/ToolProvider,javax/security/auth/spi/LoginModule,jdk/internal/io/JdkConsoleProvider,jdk/internal/logger/DefaultLoggerFinder,sun/text/spi/JavaTimeDateTimePatternProvider,sun/util/locale/provider/LocaleDataMetaInfo,sun/util/resources/LocaleData$CommonResourceBundleProvider,sun/util/resources/LocaleData$SupplementaryResourceBundleProvider,sun/util/spi/CalendarProvider provides interface\u0020;java/nio/file/spi/FileSystemProvider\u0020;impls\u0020;jdk/internal/jrtfs/JrtFileSystemProvider target macos-aarch64 flags 8000
+header exports java/io,java/lang,java/lang/annotation,java/lang/classfile,java/lang/classfile/attribute,java/lang/classfile/constantpool,java/lang/classfile/instruction,java/lang/constant,java/lang/foreign,java/lang/invoke,java/lang/module,java/lang/ref,java/lang/reflect,java/lang/runtime,java/math,java/net,java/net/spi,java/nio,java/nio/channels,java/nio/channels/spi,java/nio/charset,java/nio/charset/spi,java/nio/file,java/nio/file/attribute,java/nio/file/spi,java/security,java/security/cert,java/security/interfaces,java/security/spec,java/text,java/text/spi,java/time,java/time/chrono,java/time/format,java/time/temporal,java/time/zone,java/util,java/util/concurrent,java/util/concurrent/atomic,java/util/concurrent/locks,java/util/function,java/util/jar,java/util/random,java/util/regex,java/util/spi,java/util/stream,java/util/zip,javax/crypto,javax/crypto/interfaces,javax/crypto/spec,javax/net,javax/net/ssl,javax/security/auth,javax/security/auth/callback,javax/security/auth/login,javax/security/auth/spi,javax/security/auth/x500,javax/security/cert,jdk/internal/event[jdk.jfr],jdk/internal/javac[java.compiler\u005C;u002C;java.desktop\u005C;u002C;java.se\u005C;u002C;jdk.compiler\u005C;u002C;jdk.incubator.vector\u005C;u002C;jdk.jartool\u005C;u002C;jdk.jdeps\u005C;u002C;jdk.jfr\u005C;u002C;jdk.jlink\u005C;u002C;jdk.jshell],jdk/internal/vm/vector[jdk.incubator.vector] extraModulePackages jdk/internal/access/foreign,jdk/internal/classfile/impl,jdk/internal/constant,jdk/internal/foreign/abi,jdk/internal/foreign/abi/aarch64/linux,jdk/internal/foreign/abi/aarch64/macos,jdk/internal/foreign/abi/aarch64/windows,jdk/internal/foreign/abi/fallback,jdk/internal/foreign/abi/ppc64/aix,jdk/internal/foreign/abi/ppc64/linux,jdk/internal/foreign/abi/riscv64/linux,jdk/internal/foreign/abi/s390/linux,jdk/internal/foreign/abi/x64/sysv,jdk/internal/foreign/abi/x64/windows,jdk/internal/foreign/layout,sun/nio/ch,sun/net,jdk/internal/foreign,jdk/internal/foreign,sun/net,sun/nio/ch uses java/lang/System$LoggerFinder,java/net/ContentHandlerFactory,java/net/spi/InetAddressResolverProvider,java/net/spi/URLStreamHandlerProvider,java/nio/channels/spi/AsynchronousChannelProvider,java/nio/channels/spi/SelectorProvider,java/nio/charset/spi/CharsetProvider,java/nio/file/spi/FileSystemProvider,java/nio/file/spi/FileTypeDetector,java/security/Provider,java/text/spi/BreakIteratorProvider,java/text/spi/CollatorProvider,java/text/spi/DateFormatProvider,java/text/spi/DateFormatSymbolsProvider,java/text/spi/DecimalFormatSymbolsProvider,java/text/spi/NumberFormatProvider,java/time/chrono/AbstractChronology,java/time/chrono/Chronology,java/time/zone/ZoneRulesProvider,java/util/spi/CalendarDataProvider,java/util/spi/CalendarNameProvider,java/util/spi/CurrencyNameProvider,java/util/spi/LocaleNameProvider,java/util/spi/ResourceBundleControlProvider,java/util/spi/ResourceBundleProvider,java/util/spi/TimeZoneNameProvider,java/util/spi/ToolProvider,javax/security/auth/spi/LoginModule,jdk/internal/io/JdkConsoleProvider,jdk/internal/logger/DefaultLoggerFinder,sun/text/spi/JavaTimeDateTimePatternProvider,sun/util/locale/provider/LocaleDataMetaInfo,sun/util/resources/LocaleData$CommonResourceBundleProvider,sun/util/resources/LocaleData$SupplementaryResourceBundleProvider,sun/util/spi/CalendarProvider provides interface\u0020;java/nio/file/spi/FileSystemProvider\u0020;impls\u0020;jdk/internal/jrtfs/JrtFileSystemProvider target macos-aarch64 flags 8000
class name java/io/BufferedInputStream
-method name read descriptor ()I
@@ -284,6 +284,7 @@ innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfArrayImpl out
innerclass innerClass java/lang/classfile/AnnotationValue$OfArray outerClass java/lang/classfile/AnnotationValue innerClassName OfArray flags 609
innerclass innerClass java/lang/classfile/AnnotationValue$OfConstant outerClass java/lang/classfile/AnnotationValue innerClassName OfConstant flags 609
innerclass innerClass java/lang/classfile/AnnotationValue$OfAnnotation outerClass java/lang/classfile/AnnotationValue innerClassName OfAnnotation flags 609
+-method name tag descriptor ()C
-method name ofString descriptor (Ljava/lang/classfile/constantpool/Utf8Entry;)Ljava/lang/classfile/AnnotationValue$OfConstant;
-method name ofString descriptor (Ljava/lang/String;)Ljava/lang/classfile/AnnotationValue$OfConstant;
-method name ofDouble descriptor (Ljava/lang/classfile/constantpool/DoubleEntry;)Ljava/lang/classfile/AnnotationValue$OfConstant;
@@ -333,6 +334,7 @@ method name ofByte descriptor (Ljava/lang/classfile/constantpool/IntegerEntry;)L
method name ofByte descriptor (B)Ljava/lang/classfile/AnnotationValue$OfByte; flags 9
method name ofBoolean descriptor (Ljava/lang/classfile/constantpool/IntegerEntry;)Ljava/lang/classfile/AnnotationValue$OfBoolean; flags 9
method name ofBoolean descriptor (Z)Ljava/lang/classfile/AnnotationValue$OfBoolean; flags 9
+method name tag descriptor ()I flags 401
class name java/lang/classfile/AnnotationValue$OfAnnotation
header extends java/lang/Object implements java/lang/classfile/AnnotationValue nestHost java/lang/classfile/AnnotationValue sealed true permittedSubclasses jdk/internal/classfile/impl/AnnotationImpl$OfAnnotationImpl flags 601
@@ -1628,58 +1630,25 @@ class name java/lang/classfile/attribute/UnknownAttribute
header extends java/lang/Object implements java/lang/classfile/Attribute,java/lang/classfile/ClassElement,java/lang/classfile/MethodElement,java/lang/classfile/FieldElement sealed true permittedSubclasses jdk/internal/classfile/impl/BoundAttribute$BoundUnknownAttribute flags 601 signature Ljava/lang/Object;Ljava/lang/classfile/Attribute<Ljava/lang/classfile/attribute/UnknownAttribute;>;Ljava/lang/classfile/ClassElement;Ljava/lang/classfile/MethodElement;Ljava/lang/classfile/FieldElement;
innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundUnknownAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundUnknownAttribute flags 19
-class name java/lang/classfile/components/ClassPrinter
-header extends java/lang/Object nestMembers java/lang/classfile/components/ClassPrinter$MapNode,java/lang/classfile/components/ClassPrinter$ListNode,java/lang/classfile/components/ClassPrinter$LeafNode,java/lang/classfile/components/ClassPrinter$Node,java/lang/classfile/components/ClassPrinter$Verbosity flags 31
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Verbosity outerClass java/lang/classfile/components/ClassPrinter innerClassName Verbosity flags 4019
-innerclass innerClass java/lang/classfile/components/ClassPrinter$MapNode outerClass java/lang/classfile/components/ClassPrinter innerClassName MapNode flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$ListNode outerClass java/lang/classfile/components/ClassPrinter innerClassName ListNode flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$LeafNode outerClass java/lang/classfile/components/ClassPrinter innerClassName LeafNode flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Node outerClass java/lang/classfile/components/ClassPrinter innerClassName Node flags 609
-
-class name java/lang/classfile/components/ClassPrinter$LeafNode
-header extends java/lang/Object implements java/lang/classfile/components/ClassPrinter$Node nestHost java/lang/classfile/components/ClassPrinter sealed true permittedSubclasses jdk/internal/classfile/impl/ClassPrinterImpl$LeafNodeImpl flags 601
-innerclass innerClass java/lang/classfile/components/ClassPrinter$LeafNode outerClass java/lang/classfile/components/ClassPrinter innerClassName LeafNode flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Node outerClass java/lang/classfile/components/ClassPrinter innerClassName Node flags 609
-innerclass innerClass jdk/internal/classfile/impl/ClassPrinterImpl$LeafNodeImpl outerClass jdk/internal/classfile/impl/ClassPrinterImpl innerClassName LeafNodeImpl flags 19
-
-class name java/lang/classfile/components/ClassPrinter$ListNode
-header extends java/lang/Object implements java/lang/classfile/components/ClassPrinter$Node,java/util/List nestHost java/lang/classfile/components/ClassPrinter sealed true permittedSubclasses jdk/internal/classfile/impl/ClassPrinterImpl$ListNodeImpl flags 601 signature Ljava/lang/Object;Ljava/lang/classfile/components/ClassPrinter$Node;Ljava/util/List<Ljava/lang/classfile/components/ClassPrinter$Node;>;
-innerclass innerClass java/lang/classfile/components/ClassPrinter$ListNode outerClass java/lang/classfile/components/ClassPrinter innerClassName ListNode flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Node outerClass java/lang/classfile/components/ClassPrinter innerClassName Node flags 609
-innerclass innerClass jdk/internal/classfile/impl/ClassPrinterImpl$ListNodeImpl outerClass jdk/internal/classfile/impl/ClassPrinterImpl innerClassName ListNodeImpl flags 9
-
-class name java/lang/classfile/components/ClassPrinter$MapNode
-header extends java/lang/Object implements java/lang/classfile/components/ClassPrinter$Node,java/util/Map nestHost java/lang/classfile/components/ClassPrinter sealed true permittedSubclasses jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl flags 601 signature Ljava/lang/Object;Ljava/lang/classfile/components/ClassPrinter$Node;Ljava/util/Map<Ljava/lang/constant/ConstantDesc;Ljava/lang/classfile/components/ClassPrinter$Node;>;
-innerclass innerClass java/lang/classfile/components/ClassPrinter$MapNode outerClass java/lang/classfile/components/ClassPrinter innerClassName MapNode flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Node outerClass java/lang/classfile/components/ClassPrinter innerClassName Node flags 609
-innerclass innerClass jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl outerClass jdk/internal/classfile/impl/ClassPrinterImpl innerClassName MapNodeImpl flags 19
-
-class name java/lang/classfile/components/ClassPrinter$Node
-header extends java/lang/Object nestHost java/lang/classfile/components/ClassPrinter sealed true permittedSubclasses java/lang/classfile/components/ClassPrinter$LeafNode,java/lang/classfile/components/ClassPrinter$ListNode,java/lang/classfile/components/ClassPrinter$MapNode flags 601
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Node outerClass java/lang/classfile/components/ClassPrinter innerClassName Node flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$LeafNode outerClass java/lang/classfile/components/ClassPrinter innerClassName LeafNode flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$ListNode outerClass java/lang/classfile/components/ClassPrinter innerClassName ListNode flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$MapNode outerClass java/lang/classfile/components/ClassPrinter innerClassName MapNode flags 609
-
-class name java/lang/classfile/components/ClassPrinter$Verbosity
-header extends java/lang/Enum nestHost java/lang/classfile/components/ClassPrinter flags 4031 signature Ljava/lang/Enum<Ljava/lang/classfile/components/ClassPrinter$Verbosity;>;
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Verbosity outerClass java/lang/classfile/components/ClassPrinter innerClassName Verbosity flags 4019
-
-class name java/lang/classfile/components/ClassRemapper
-header extends java/lang/Object implements java/lang/classfile/ClassTransform sealed true permittedSubclasses jdk/internal/classfile/impl/ClassRemapperImpl flags 601
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-class name java/lang/classfile/components/ClassPrinter
-class name java/lang/classfile/components/CodeLocalsShifter
-header extends java/lang/Object implements java/lang/classfile/CodeTransform sealed true permittedSubclasses jdk/internal/classfile/impl/CodeLocalsShifterImpl flags 601
-innerclass innerClass java/lang/invoke/TypeDescriptor$OfField outerClass java/lang/invoke/TypeDescriptor innerClassName OfField flags 609
+-class name java/lang/classfile/components/ClassPrinter$LeafNode
-class name java/lang/classfile/components/CodeRelabeler
-header extends java/lang/Object implements java/lang/classfile/CodeTransform sealed true permittedSubclasses jdk/internal/classfile/impl/CodeRelabelerImpl flags 601
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
--method name relabel descriptor (Ljava/lang/classfile/Label;Ljava/lang/classfile/CodeBuilder;)Ljava/lang/classfile/Label;
+-class name java/lang/classfile/components/ClassPrinter$ListNode
+
+-class name java/lang/classfile/components/ClassPrinter$MapNode
+
+-class name java/lang/classfile/components/ClassPrinter$Node
+
+-class name java/lang/classfile/components/ClassPrinter$Verbosity
+
+-class name java/lang/classfile/components/ClassRemapper
+
+-class name java/lang/classfile/components/CodeLocalsShifter
+
+-class name java/lang/classfile/components/CodeRelabeler
-class name java/lang/classfile/components/CodeStackTracker
-header extends java/lang/Object implements java/lang/classfile/CodeTransform sealed true permittedSubclasses jdk/internal/classfile/impl/CodeStackTrackerImpl flags 601
+-class name java/lang/classfile/components/CodeStackTracker
class name java/lang/classfile/constantpool/AnnotationConstantValueEntry
header extends java/lang/Object implements java/lang/classfile/constantpool/PoolEntry sealed true permittedSubclasses java/lang/classfile/constantpool/DoubleEntry,java/lang/classfile/constantpool/FloatEntry,java/lang/classfile/constantpool/IntegerEntry,java/lang/classfile/constantpool/LongEntry,java/lang/classfile/constantpool/Utf8Entry flags 601
@@ -1775,6 +1744,7 @@ innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$PackageEntry
class name java/lang/classfile/constantpool/PoolEntry
header extends java/lang/Object sealed true permittedSubclasses java/lang/classfile/constantpool/AnnotationConstantValueEntry,java/lang/classfile/constantpool/DynamicConstantPoolEntry,java/lang/classfile/constantpool/LoadableConstantEntry,java/lang/classfile/constantpool/MemberRefEntry,java/lang/classfile/constantpool/ModuleEntry,java/lang/classfile/constantpool/NameAndTypeEntry,java/lang/classfile/constantpool/PackageEntry flags 601
+-method name tag descriptor ()B
field name TAG_CLASS descriptor I constantValue 7 flags 19
field name TAG_DOUBLE descriptor I constantValue 6 flags 19
field name TAG_DYNAMIC descriptor I constantValue 17 flags 19
@@ -1792,6 +1762,7 @@ field name TAG_NAME_AND_TYPE descriptor I constantValue 12 flags 19
field name TAG_PACKAGE descriptor I constantValue 20 flags 19
field name TAG_STRING descriptor I constantValue 8 flags 19
field name TAG_UTF8 descriptor I constantValue 1 flags 19
+method name tag descriptor ()I flags 401
class name java/lang/classfile/constantpool/StringEntry
header extends java/lang/Object implements java/lang/classfile/constantpool/ConstantValueEntry sealed true permittedSubclasses jdk/internal/classfile/impl/AbstractPoolEntry$StringEntryImpl flags 601
@@ -2255,9 +2226,27 @@ method name doPrivileged descriptor (Ljava/security/PrivilegedExceptionAction;Lj
method name doPrivileged descriptor (Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;[Ljava/security/Permission;)Ljava/lang/Object; thrownTypes java/security/PrivilegedActionException flags 89 signature <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
method name doPrivilegedWithCombiner descriptor (Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;[Ljava/security/Permission;)Ljava/lang/Object; thrownTypes java/security/PrivilegedActionException flags 89 signature <T:Ljava/lang/Object;>(Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;[Ljava/security/Permission;)TT;
+class name java/security/KeyStore
+header extends java/lang/Object nestMembers java/security/KeyStore$Builder,java/security/KeyStore$TrustedCertificateEntry,java/security/KeyStore$SecretKeyEntry,java/security/KeyStore$PrivateKeyEntry,java/security/KeyStore$Entry,java/security/KeyStore$Entry$Attribute,java/security/KeyStore$CallbackHandlerProtection,java/security/KeyStore$PasswordProtection,java/security/KeyStore$ProtectionParameter,java/security/KeyStore$LoadStoreParameter flags 21
+innerclass innerClass java/security/KeyStore$LoadStoreParameter outerClass java/security/KeyStore innerClassName LoadStoreParameter flags 609
+innerclass innerClass java/security/KeyStore$ProtectionParameter outerClass java/security/KeyStore innerClassName ProtectionParameter flags 609
+innerclass innerClass java/security/KeyStore$Entry outerClass java/security/KeyStore innerClassName Entry flags 609
+innerclass innerClass java/security/Provider$Service outerClass java/security/Provider innerClassName Service flags 9
+innerclass innerClass java/security/KeyStore$Builder outerClass java/security/KeyStore innerClassName Builder flags 409
+innerclass innerClass java/security/KeyStore$TrustedCertificateEntry outerClass java/security/KeyStore innerClassName TrustedCertificateEntry flags 19
+innerclass innerClass java/security/KeyStore$SecretKeyEntry outerClass java/security/KeyStore innerClassName SecretKeyEntry flags 19
+innerclass innerClass java/security/KeyStore$PrivateKeyEntry outerClass java/security/KeyStore innerClassName PrivateKeyEntry flags 19
+innerclass innerClass java/security/KeyStore$CallbackHandlerProtection outerClass java/security/KeyStore innerClassName CallbackHandlerProtection flags 9
+innerclass innerClass java/security/KeyStore$PasswordProtection outerClass java/security/KeyStore innerClassName PasswordProtection flags 9
+innerclass innerClass java/security/KeyStore$Entry$Attribute outerClass java/security/KeyStore$Entry innerClassName Attribute flags 609
+
class name java/security/ProtectionDomain
header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
+class name java/security/SecureRandom
+header extends java/util/Random flags 21
+innerclass innerClass java/security/Provider$Service outerClass java/security/Provider innerClassName Service flags 9
+
class name java/security/cert/CertPathBuilder
header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -2496,7 +2485,7 @@ innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$AbstractRefE
-field name tag descriptor B
-method name rawUtf8EntryFromStandardAttributeName descriptor (Ljava/lang/String;)Ljava/lang/classfile/constantpool/Utf8Entry;
-method name tag descriptor ()B
-method name tag descriptor ()B flags 401
+method name tag descriptor ()I flags 401
class name jdk/internal/classfile/impl/AbstractPoolEntry$AbstractDynamicConstantPoolEntry
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
@@ -2517,11 +2506,11 @@ class name jdk/internal/classfile/impl/AbstractPoolEntry$ClassEntryImpl
-field name sym descriptor Ljava/lang/constant/ClassDesc;
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
field name sym descriptor Ljava/lang/constant/ClassDesc; flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/Stable;
-method name tag descriptor ()B flags 1
method name hashCode descriptor ()I flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$ConstantDynamicEntryImpl
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$DoubleEntryImpl
header extends jdk/internal/classfile/impl/AbstractPoolEntry implements java/lang/classfile/constantpool/DoubleEntry nestHost jdk/internal/classfile/impl/AbstractPoolEntry flags 31
@@ -2530,12 +2519,12 @@ innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$DoubleEntryI
-method name toString descriptor ()Ljava/lang/String;
-method name constantValue descriptor ()Ljava/lang/constant/ConstantDesc;
-method name value descriptor ()Ljava/lang/constant/ConstantDesc;
-method name tag descriptor ()B flags 1
method name width descriptor ()I flags 1
method name constantValue descriptor ()Ljava/lang/constant/ConstantDesc; flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$FieldRefEntryImpl
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$FloatEntryImpl
header extends jdk/internal/classfile/impl/AbstractPoolEntry implements java/lang/classfile/constantpool/FloatEntry nestHost jdk/internal/classfile/impl/AbstractPoolEntry flags 31
@@ -2544,8 +2533,8 @@ innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$FloatEntryIm
-method name toString descriptor ()Ljava/lang/String;
-method name constantValue descriptor ()Ljava/lang/constant/ConstantDesc;
-method name value descriptor ()Ljava/lang/constant/ConstantDesc;
-method name tag descriptor ()B flags 1
method name constantValue descriptor ()Ljava/lang/constant/ConstantDesc; flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$IntegerEntryImpl
header extends jdk/internal/classfile/impl/AbstractPoolEntry implements java/lang/classfile/constantpool/IntegerEntry nestHost jdk/internal/classfile/impl/AbstractPoolEntry flags 31
@@ -2554,14 +2543,14 @@ innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$IntegerEntry
-method name toString descriptor ()Ljava/lang/String;
-method name constantValue descriptor ()Ljava/lang/constant/ConstantDesc;
-method name value descriptor ()Ljava/lang/constant/ConstantDesc;
-method name tag descriptor ()B flags 1
method name constantValue descriptor ()Ljava/lang/constant/ConstantDesc; flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$InterfaceMethodRefEntryImpl
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$InvokeDynamicEntryImpl
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$LongEntryImpl
header extends jdk/internal/classfile/impl/AbstractPoolEntry implements java/lang/classfile/constantpool/LongEntry nestHost jdk/internal/classfile/impl/AbstractPoolEntry flags 31
@@ -2570,48 +2559,48 @@ innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$LongEntryImp
-method name toString descriptor ()Ljava/lang/String;
-method name constantValue descriptor ()Ljava/lang/constant/ConstantDesc;
-method name value descriptor ()Ljava/lang/constant/ConstantDesc;
-method name tag descriptor ()B flags 1
method name width descriptor ()I flags 1
method name constantValue descriptor ()Ljava/lang/constant/ConstantDesc; flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$MethodHandleEntryImpl
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$MethodRefEntryImpl
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$MethodTypeEntryImpl
-field name sym descriptor Ljava/lang/constant/MethodTypeDesc;
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$ModuleEntryImpl
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$NameAndTypeEntryImpl
-field name typeSym descriptor Ljava/lang/invoke/TypeDescriptor;
-method name fieldTypeSymbol descriptor ()Ljava/lang/constant/ClassDesc;
-method name methodTypeSymbol descriptor ()Ljava/lang/constant/MethodTypeDesc;
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$PackageEntryImpl
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
-class name jdk/internal/classfile/impl/AbstractPoolEntry$PrimitiveEntry
class name jdk/internal/classfile/impl/AbstractPoolEntry$StringEntryImpl
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
-method name tag descriptor ()B flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPoolEntry$Utf8EntryImpl
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
-method name tag descriptor ()B flags 1
method name fieldTypeSymbol descriptor ()Ljava/lang/constant/ClassDesc; flags 1
method name methodTypeSymbol descriptor ()Ljava/lang/constant/MethodTypeDesc; flags 1
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AbstractPseudoInstruction$AbstractLocalPseudo
header extends jdk/internal/classfile/impl/AbstractPseudoInstruction implements jdk/internal/classfile/impl/Util$WritableLocalVariable nestHost jdk/internal/classfile/impl/AbstractPseudoInstruction sealed true permittedSubclasses jdk/internal/classfile/impl/AbstractPseudoInstruction$UnboundLocalVariable,jdk/internal/classfile/impl/AbstractPseudoInstruction$UnboundLocalVariableType flags 420
@@ -2663,10 +2652,14 @@ class name jdk/internal/classfile/impl/AnnotationImpl$AnnotationElementImpl
method name toString descriptor ()Ljava/lang/String; flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfAnnotationImpl
+-method name tag descriptor ()C
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfArrayImpl
+-method name tag descriptor ()C
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfBooleanImpl
header extends java/lang/Record implements java/lang/classfile/AnnotationValue$OfBoolean nestHost jdk/internal/classfile/impl/AnnotationImpl record true flags 31
@@ -2674,6 +2667,8 @@ recordcomponent name constant descriptor Ljava/lang/classfile/constantpool/Integ
innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfBooleanImpl outerClass jdk/internal/classfile/impl/AnnotationImpl innerClassName OfBooleanImpl flags 19
innerclass innerClass java/lang/classfile/AnnotationValue$OfBoolean outerClass java/lang/classfile/AnnotationValue innerClassName OfBoolean flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name tag descriptor ()C
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfByteImpl
header extends java/lang/Record implements java/lang/classfile/AnnotationValue$OfByte nestHost jdk/internal/classfile/impl/AnnotationImpl record true flags 31
@@ -2681,6 +2676,8 @@ recordcomponent name constant descriptor Ljava/lang/classfile/constantpool/Integ
innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfByteImpl outerClass jdk/internal/classfile/impl/AnnotationImpl innerClassName OfByteImpl flags 19
innerclass innerClass java/lang/classfile/AnnotationValue$OfByte outerClass java/lang/classfile/AnnotationValue innerClassName OfByte flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name tag descriptor ()C
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfCharImpl
header extends java/lang/Record implements java/lang/classfile/AnnotationValue$OfChar nestHost jdk/internal/classfile/impl/AnnotationImpl record true flags 31
@@ -2689,18 +2686,20 @@ innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfCharImpl oute
innerclass innerClass java/lang/classfile/AnnotationValue$OfChar outerClass java/lang/classfile/AnnotationValue innerClassName OfChar flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
method name <init> descriptor (Ljava/lang/classfile/constantpool/IntegerEntry;)V flags 1 methodParameters 0:constant
-method name tag descriptor ()C flags 1
method name charValue descriptor ()C flags 1
method name toString descriptor ()Ljava/lang/String; flags 11
method name hashCode descriptor ()I flags 11
method name equals descriptor (Ljava/lang/Object;)Z flags 11
method name constant descriptor ()Ljava/lang/classfile/constantpool/IntegerEntry; flags 1
method name constant descriptor ()Ljava/lang/classfile/constantpool/AnnotationConstantValueEntry; flags 1041
+method name tag descriptor ()I flags 1
-class name jdk/internal/classfile/impl/AnnotationImpl$OfCharacterImpl
class name jdk/internal/classfile/impl/AnnotationImpl$OfClassImpl
+-method name tag descriptor ()C
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
+method name tag descriptor ()I flags 1
-class name jdk/internal/classfile/impl/AnnotationImpl$OfConstantImpl
@@ -2710,9 +2709,13 @@ recordcomponent name constant descriptor Ljava/lang/classfile/constantpool/Doubl
innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfDoubleImpl outerClass jdk/internal/classfile/impl/AnnotationImpl innerClassName OfDoubleImpl flags 19
innerclass innerClass java/lang/classfile/AnnotationValue$OfDouble outerClass java/lang/classfile/AnnotationValue innerClassName OfDouble flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name tag descriptor ()C
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfEnumImpl
+-method name tag descriptor ()C
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfFloatImpl
header extends java/lang/Record implements java/lang/classfile/AnnotationValue$OfFloat nestHost jdk/internal/classfile/impl/AnnotationImpl record true flags 31
@@ -2720,6 +2723,8 @@ recordcomponent name constant descriptor Ljava/lang/classfile/constantpool/Float
innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfFloatImpl outerClass jdk/internal/classfile/impl/AnnotationImpl innerClassName OfFloatImpl flags 19
innerclass innerClass java/lang/classfile/AnnotationValue$OfFloat outerClass java/lang/classfile/AnnotationValue innerClassName OfFloat flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name tag descriptor ()C
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfIntImpl
header extends java/lang/Record implements java/lang/classfile/AnnotationValue$OfInt nestHost jdk/internal/classfile/impl/AnnotationImpl record true flags 31
@@ -2728,13 +2733,13 @@ innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfIntImpl outer
innerclass innerClass java/lang/classfile/AnnotationValue$OfInt outerClass java/lang/classfile/AnnotationValue innerClassName OfInt flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
method name <init> descriptor (Ljava/lang/classfile/constantpool/IntegerEntry;)V flags 1 methodParameters 0:constant
-method name tag descriptor ()C flags 1
method name intValue descriptor ()I flags 1
method name toString descriptor ()Ljava/lang/String; flags 11
method name hashCode descriptor ()I flags 11
method name equals descriptor (Ljava/lang/Object;)Z flags 11
method name constant descriptor ()Ljava/lang/classfile/constantpool/IntegerEntry; flags 1
method name constant descriptor ()Ljava/lang/classfile/constantpool/AnnotationConstantValueEntry; flags 1041
+method name tag descriptor ()I flags 1
-class name jdk/internal/classfile/impl/AnnotationImpl$OfIntegerImpl
@@ -2744,6 +2749,8 @@ recordcomponent name constant descriptor Ljava/lang/classfile/constantpool/LongE
innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfLongImpl outerClass jdk/internal/classfile/impl/AnnotationImpl innerClassName OfLongImpl flags 19
innerclass innerClass java/lang/classfile/AnnotationValue$OfLong outerClass java/lang/classfile/AnnotationValue innerClassName OfLong flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name tag descriptor ()C
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfShortImpl
header extends java/lang/Record implements java/lang/classfile/AnnotationValue$OfShort nestHost jdk/internal/classfile/impl/AnnotationImpl record true flags 31
@@ -2751,6 +2758,8 @@ recordcomponent name constant descriptor Ljava/lang/classfile/constantpool/Integ
innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfShortImpl outerClass jdk/internal/classfile/impl/AnnotationImpl innerClassName OfShortImpl flags 19
innerclass innerClass java/lang/classfile/AnnotationValue$OfShort outerClass java/lang/classfile/AnnotationValue innerClassName OfShort flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name tag descriptor ()C
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/AnnotationImpl$OfStringImpl
header extends java/lang/Record implements java/lang/classfile/AnnotationValue$OfString nestHost jdk/internal/classfile/impl/AnnotationImpl record true flags 31
@@ -2758,6 +2767,8 @@ recordcomponent name constant descriptor Ljava/lang/classfile/constantpool/Utf8E
innerclass innerClass jdk/internal/classfile/impl/AnnotationImpl$OfStringImpl outerClass jdk/internal/classfile/impl/AnnotationImpl innerClassName OfStringImpl flags 19
innerclass innerClass java/lang/classfile/AnnotationValue$OfString outerClass java/lang/classfile/AnnotationValue innerClassName OfString flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name tag descriptor ()C
+method name tag descriptor ()I flags 1
class name jdk/internal/classfile/impl/BootstrapMethodEntryImpl
-method name writeTo descriptor (Ljava/lang/classfile/BufWriter;)V
@@ -2923,43 +2934,15 @@ innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang
-method name forEachElement descriptor (Ljava/util/function/Consumer;)V
method name forEach descriptor (Ljava/util/function/Consumer;)V flags 1 signature (Ljava/util/function/Consumer<-Ljava/lang/classfile/ClassElement;>;)V
-class name jdk/internal/classfile/impl/ClassPrinterImpl
-header extends java/lang/Object nestMembers jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl,jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl$PrivateListNodeImpl,jdk/internal/classfile/impl/ClassPrinterImpl$ListNodeImpl,jdk/internal/classfile/impl/ClassPrinterImpl$LeafNodeImpl flags 31
-innerclass innerClass jdk/internal/classfile/impl/ClassPrinterImpl$LeafNodeImpl outerClass jdk/internal/classfile/impl/ClassPrinterImpl innerClassName LeafNodeImpl flags 19
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Node outerClass java/lang/classfile/components/ClassPrinter innerClassName Node flags 609
-innerclass innerClass jdk/internal/classfile/impl/ClassPrinterImpl$ListNodeImpl outerClass jdk/internal/classfile/impl/ClassPrinterImpl innerClassName ListNodeImpl flags 9
-innerclass innerClass jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl outerClass jdk/internal/classfile/impl/ClassPrinterImpl innerClassName MapNodeImpl flags 19
-innerclass innerClass java/lang/classfile/components/ClassPrinter$LeafNode outerClass java/lang/classfile/components/ClassPrinter innerClassName LeafNode flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfString outerClass java/lang/classfile/AnnotationValue innerClassName OfString flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfDouble outerClass java/lang/classfile/AnnotationValue innerClassName OfDouble flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfFloat outerClass java/lang/classfile/AnnotationValue innerClassName OfFloat flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfLong outerClass java/lang/classfile/AnnotationValue innerClassName OfLong flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfInt outerClass java/lang/classfile/AnnotationValue innerClassName OfInt flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfShort outerClass java/lang/classfile/AnnotationValue innerClassName OfShort flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfChar outerClass java/lang/classfile/AnnotationValue innerClassName OfChar flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfByte outerClass java/lang/classfile/AnnotationValue innerClassName OfByte flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfBoolean outerClass java/lang/classfile/AnnotationValue innerClassName OfBoolean flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfClass outerClass java/lang/classfile/AnnotationValue innerClassName OfClass flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfEnum outerClass java/lang/classfile/AnnotationValue innerClassName OfEnum flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfAnnotation outerClass java/lang/classfile/AnnotationValue innerClassName OfAnnotation flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfArray outerClass java/lang/classfile/AnnotationValue innerClassName OfArray flags 609
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Verbosity outerClass java/lang/classfile/components/ClassPrinter innerClassName Verbosity flags 4019
-innerclass innerClass java/lang/classfile/components/ClassPrinter$MapNode outerClass java/lang/classfile/components/ClassPrinter innerClassName MapNode flags 609
-innerclass innerClass java/lang/constant/DirectMethodHandleDesc$Kind outerClass java/lang/constant/DirectMethodHandleDesc innerClassName Kind flags 4019
-innerclass innerClass java/lang/classfile/instruction/DiscontinuedInstruction$JsrInstruction outerClass java/lang/classfile/instruction/DiscontinuedInstruction innerClassName JsrInstruction flags 609
-innerclass innerClass java/lang/classfile/instruction/DiscontinuedInstruction$RetInstruction outerClass java/lang/classfile/instruction/DiscontinuedInstruction innerClassName RetInstruction flags 609
-innerclass innerClass java/lang/classfile/TypeAnnotation$TargetInfo outerClass java/lang/classfile/TypeAnnotation innerClassName TargetInfo flags 609
-innerclass innerClass java/lang/classfile/TypeAnnotation$OffsetTarget outerClass java/lang/classfile/TypeAnnotation innerClassName OffsetTarget flags 609
-innerclass innerClass java/lang/classfile/TypeAnnotation$TypeArgumentTarget outerClass java/lang/classfile/TypeAnnotation innerClassName TypeArgumentTarget flags 609
-innerclass innerClass java/lang/classfile/TypeAnnotation$LocalVarTarget outerClass java/lang/classfile/TypeAnnotation innerClassName LocalVarTarget flags 609
-innerclass innerClass java/lang/classfile/TypeAnnotation$LocalVarTargetInfo outerClass java/lang/classfile/TypeAnnotation innerClassName LocalVarTargetInfo flags 609
-innerclass innerClass java/lang/classfile/TypeAnnotation$TargetType outerClass java/lang/classfile/TypeAnnotation innerClassName TargetType flags 4019
-innerclass innerClass java/lang/classfile/attribute/StackMapFrameInfo$VerificationTypeInfo outerClass java/lang/classfile/attribute/StackMapFrameInfo innerClassName VerificationTypeInfo flags 609
-innerclass innerClass java/lang/classfile/attribute/StackMapFrameInfo$SimpleVerificationTypeInfo outerClass java/lang/classfile/attribute/StackMapFrameInfo innerClassName SimpleVerificationTypeInfo flags 4019
-innerclass innerClass java/lang/classfile/attribute/StackMapFrameInfo$ObjectVerificationTypeInfo outerClass java/lang/classfile/attribute/StackMapFrameInfo innerClassName ObjectVerificationTypeInfo flags 609
-innerclass innerClass java/lang/classfile/attribute/StackMapFrameInfo$UninitializedVerificationTypeInfo outerClass java/lang/classfile/attribute/StackMapFrameInfo innerClassName UninitializedVerificationTypeInfo flags 609
-innerclass innerClass jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl$PrivateListNodeImpl outerClass jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl innerClassName PrivateListNodeImpl flags 1a
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-class name jdk/internal/classfile/impl/ClassPrinterImpl
+
+-class name jdk/internal/classfile/impl/ClassPrinterImpl$LeafNodeImpl
+
+-class name jdk/internal/classfile/impl/ClassPrinterImpl$ListNodeImpl
+
+-class name jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl
+
+-class name jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl$PrivateListNodeImpl
class name jdk/internal/classfile/impl/ClassReaderImpl
header extends java/lang/Object implements java/lang/classfile/ClassReader flags 31
@@ -2993,27 +2976,7 @@ innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$AbstractMemb
-method name compare descriptor (Ljava/lang/classfile/BufWriter;III)Z
method name compare descriptor (Ljdk/internal/classfile/impl/BufWriterImpl;III)Z flags 1
-class name jdk/internal/classfile/impl/ClassRemapperImpl
-header extends java/lang/Record implements java/lang/classfile/components/ClassRemapper record true flags 31
-recordcomponent name mapFunction descriptor Ljava/util/function/Function; signature Ljava/util/function/Function<Ljava/lang/constant/ClassDesc;Ljava/lang/constant/ClassDesc;>;
-innerclass innerClass java/lang/classfile/Signature$ClassTypeSig outerClass java/lang/classfile/Signature innerClassName ClassTypeSig flags 609
-innerclass innerClass java/lang/constant/DirectMethodHandleDesc$Kind outerClass java/lang/constant/DirectMethodHandleDesc innerClassName Kind flags 4019
-innerclass innerClass java/lang/classfile/Signature$ArrayTypeSig outerClass java/lang/classfile/Signature innerClassName ArrayTypeSig flags 609
-innerclass innerClass java/lang/classfile/Signature$TypeArg outerClass java/lang/classfile/Signature innerClassName TypeArg flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfAnnotation outerClass java/lang/classfile/AnnotationValue innerClassName OfAnnotation flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfArray outerClass java/lang/classfile/AnnotationValue innerClassName OfArray flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfConstant outerClass java/lang/classfile/AnnotationValue innerClassName OfConstant flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfClass outerClass java/lang/classfile/AnnotationValue innerClassName OfClass flags 609
-innerclass innerClass java/lang/classfile/AnnotationValue$OfEnum outerClass java/lang/classfile/AnnotationValue innerClassName OfEnum flags 609
-innerclass innerClass java/lang/classfile/Signature$TypeParam outerClass java/lang/classfile/Signature innerClassName TypeParam flags 609
-innerclass innerClass java/lang/classfile/Signature$RefTypeSig outerClass java/lang/classfile/Signature innerClassName RefTypeSig flags 609
-innerclass innerClass java/lang/classfile/TypeAnnotation$TargetInfo outerClass java/lang/classfile/TypeAnnotation innerClassName TargetInfo flags 609
-innerclass innerClass java/lang/classfile/Signature$TypeArg$Unbounded outerClass java/lang/classfile/Signature$TypeArg innerClassName Unbounded flags 609
-innerclass innerClass java/lang/classfile/Signature$TypeArg$Bounded outerClass java/lang/classfile/Signature$TypeArg innerClassName Bounded flags 609
-innerclass innerClass java/lang/classfile/Signature$TypeArg$Bounded$WildcardIndicator outerClass java/lang/classfile/Signature$TypeArg$Bounded innerClassName WildcardIndicator flags 4019
-innerclass innerClass java/lang/classfile/instruction/ConstantInstruction$LoadConstantInstruction outerClass java/lang/classfile/instruction/ConstantInstruction innerClassName LoadConstantInstruction flags 609
-innerclass innerClass java/lang/classfile/Signature$ThrowableSig outerClass java/lang/classfile/Signature innerClassName ThrowableSig flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-class name jdk/internal/classfile/impl/ClassRemapperImpl
class name jdk/internal/classfile/impl/CodeImpl
header extends jdk/internal/classfile/impl/BoundAttribute$BoundCodeAttribute implements jdk/internal/classfile/impl/LabelContext nestMembers jdk/internal/classfile/impl/CodeImpl$ExceptionHandlerAction flags 31
@@ -3057,6 +3020,12 @@ method name writeTo descriptor (Ljdk/internal/classfile/impl/BufWriterImpl;)V fl
method name forEach descriptor (Ljava/util/function/Consumer;)V flags 1 signature (Ljava/util/function/Consumer<-Ljava/lang/classfile/CodeElement;>;)V
method name compareCodeBytes descriptor (Ljdk/internal/classfile/impl/BufWriterImpl;II)Z flags 1
+-class name jdk/internal/classfile/impl/CodeLocalsShifterImpl
+
+-class name jdk/internal/classfile/impl/CodeRelabelerImpl
+
+-class name jdk/internal/classfile/impl/CodeStackTrackerImpl
+
class name jdk/internal/classfile/impl/DirectClassBuilder
header extends jdk/internal/classfile/impl/AbstractDirectBuilder implements java/lang/classfile/ClassBuilder flags 31 signature Ljdk/internal/classfile/impl/AbstractDirectBuilder<Ljava/lang/classfile/ClassModel;>;Ljava/lang/classfile/ClassBuilder;
innerclass innerClass jdk/internal/classfile/impl/Util$Writable outerClass jdk/internal/classfile/impl/Util innerClassName Writable flags 608
@@ -3590,7 +3559,6 @@ innerclass innerClass java/lang/classfile/ClassFile$AttributesProcessingOption o
innerclass innerClass java/lang/classfile/Opcode$Kind outerClass java/lang/classfile/Opcode innerClassName Kind flags 4019
innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$Utf8EntryImpl outerClass jdk/internal/classfile/impl/AbstractPoolEntry innerClassName Utf8EntryImpl flags 19
innerclass innerClass jdk/internal/classfile/impl/Util$Writable outerClass jdk/internal/classfile/impl/Util innerClassName Writable flags 608
-innerclass innerClass java/lang/classfile/components/ClassPrinter$Verbosity outerClass java/lang/classfile/components/ClassPrinter innerClassName Verbosity flags 4019
innerclass innerClass jdk/internal/classfile/impl/Util$WritableLocalVariable outerClass jdk/internal/classfile/impl/Util innerClassName WritableLocalVariable flags 608
innerclass innerClass java/lang/reflect/AccessFlag$Location outerClass java/lang/reflect/AccessFlag innerClassName Location flags 4019
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
diff --git a/src/jdk.compiler/share/data/symbols/java.desktop-O.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-O.sym.txt
index 6dd55f78e1e..826d55f8f6b 100644
--- a/src/jdk.compiler/share/data/symbols/java.desktop-O.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.desktop-O.sym.txt
@@ -119,3 +119,12 @@ innerclass innerClass javax/swing/plaf/basic/BasicScrollBarUI$TrackListener oute
class name javax/swing/plaf/basic/BasicSplitPaneDivider
method name setEnabled descriptor (Z)V flags 1
+class name javax/swing/text/html/CSS
+header extends java/lang/Object implements java/io/Serializable nestMembers javax/swing/text/html/CSS$Attribute flags 21
+innerclass innerClass javax/swing/text/html/CSS$Attribute outerClass javax/swing/text/html/CSS innerClassName Attribute flags 19
+innerclass innerClass javax/swing/text/html/HTML$Tag outerClass javax/swing/text/html/HTML innerClassName Tag flags 9
+innerclass innerClass javax/swing/text/html/HTML$Attribute outerClass javax/swing/text/html/HTML innerClassName Attribute flags 19
+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
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
diff --git a/src/jdk.compiler/share/data/symbols/java.management-O.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-O.sym.txt
index 0e1aff70d8d..b86e22e3fcd 100644
--- a/src/jdk.compiler/share/data/symbols/java.management-O.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.management-O.sym.txt
@@ -29,6 +29,9 @@
module name java.management
header exports java/lang/management,javax/management,javax/management/loading,javax/management/modelmbean,javax/management/monitor,javax/management/openmbean,javax/management/relation,javax/management/remote,javax/management/timer requires name\u0020;java.base\u0020;flags\u0020;8000 uses javax/management/remote/JMXConnectorProvider,javax/management/remote/JMXConnectorServerProvider,sun/management/spi/PlatformMBeanProvider provides interface\u0020;javax/security/auth/spi/LoginModule\u0020;impls\u0020;com/sun/jmx/remote/security/FileLoginModule target macos-aarch64 flags 8000
+class name java/lang/management/RuntimeMXBean
+header extends java/lang/Object implements java/lang/management/PlatformManagedObject flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I3)
+
class name javax/management/Notification
header extends java/util/EventObject flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
diff --git a/src/jdk.compiler/share/data/symbols/java.management.rmi-O.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-O.sym.txt
index fdb48929b8d..c86eeefa924 100644
--- a/src/jdk.compiler/share/data/symbols/java.management.rmi-O.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.management.rmi-O.sym.txt
@@ -29,3 +29,9 @@
module name java.management.rmi
header exports javax/management/remote/rmi requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.naming\u0020;flags\u0020;0,name\u0020;java.management\u0020;flags\u0020;20,name\u0020;java.rmi\u0020;flags\u0020;20 provides interface\u0020;javax/management/remote/JMXConnectorProvider\u0020;impls\u0020;com/sun/jmx/remote/protocol/rmi/ClientProvider,interface\u0020;javax/management/remote/JMXConnectorServerProvider\u0020;impls\u0020;com/sun/jmx/remote/protocol/rmi/ServerProvider target macos-aarch64 flags 8000
+class name javax/management/remote/rmi/RMIConnector
+header extends java/lang/Object implements javax/management/remote/JMXConnector,java/io/Serializable,javax/management/remote/JMXAddressable flags 21
+innerclass innerClass java/lang/module/ModuleDescriptor$Modifier outerClass java/lang/module/ModuleDescriptor innerClassName Modifier flags 4019
+innerclass innerClass java/lang/module/ModuleDescriptor$Builder outerClass java/lang/module/ModuleDescriptor innerClassName Builder flags 19
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
diff --git a/src/jdk.compiler/share/data/symbols/java.naming-O.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-O.sym.txt
index fc004bc4f62..933125dc098 100644
--- a/src/jdk.compiler/share/data/symbols/java.naming-O.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.naming-O.sym.txt
@@ -29,3 +29,6 @@
module name java.naming
header exports javax/naming,javax/naming/directory,javax/naming/event,javax/naming/ldap,javax/naming/spi,javax/naming/ldap/spi requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.security.sasl\u0020;flags\u0020;0 uses javax/naming/ldap/StartTlsResponse,javax/naming/spi/InitialContextFactory,javax/naming/ldap/spi/LdapDnsProvider provides interface\u0020;java/security/Provider\u0020;impls\u0020;sun/security/provider/certpath/ldap/JdkLDAP target macos-aarch64 flags 8000
+class name javax/naming/Context
+-field name APPLET descriptor Ljava/lang/String;
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-O.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-O.sym.txt
index 88a5fe93048..4f8b58b5ec9 100644
--- a/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-O.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-O.sym.txt
@@ -45,11 +45,19 @@ innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang
-method name mismatch descriptor (Ljava/lang/foreign/MemorySegment;JJLjava/lang/foreign/MemorySegment;JJ)J
-method name reinterpretInternal descriptor (Ljava/lang/Class;JLjava/lang/foreign/MemorySegment$Scope;Ljava/util/function/Consumer;)Ljava/lang/foreign/MemorySegment;
-method name scope descriptor ()Ljava/lang/foreign/MemorySegment$Scope;
+-method name getString descriptor (J)Ljava/lang/String;
+-method name getString descriptor (JLjava/nio/charset/Charset;)Ljava/lang/String;
+-method name setString descriptor (JLjava/lang/String;)V
+-method name setString descriptor (JLjava/lang/String;Ljava/nio/charset/Charset;)V
method name fill descriptor (B)Ljava/lang/foreign/MemorySegment; flags 11 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
method name checkEnclosingLayout descriptor (JLjava/lang/foreign/MemoryLayout;Z)V flags 11 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
method name ofBuffer descriptor (Ljava/nio/Buffer;)Ljdk/internal/foreign/AbstractMemorySegmentImpl; flags 9 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
method name scope descriptor ()Ljdk/internal/foreign/MemorySessionImpl; flags 1
method name scope descriptor ()Ljava/lang/foreign/MemorySegment$Scope; flags 1041
+method name getString descriptor (J)Ljava/lang/String; flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name getString descriptor (JLjava/nio/charset/Charset;)Ljava/lang/String; flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name setString descriptor (JLjava/lang/String;)V flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name setString descriptor (JLjava/lang/String;Ljava/nio/charset/Charset;)V flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
class name jdk/internal/foreign/GlobalSession
-method name isCloseable descriptor ()Z
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
index 64a05a5cacf..314c9938590 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c
index 928cc3d6ed8..d522c4864ba 100644
--- a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c
+++ b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 2002 Graz University of Technology. All rights reserved.
diff --git a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKey.java
index 9c985f0e483..010eef50984 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKey.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.crypto.mscapi/windows/classes/sun/security/mscapi/CPrivateKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPrivateKey.java
index c3882616615..23c87ced161 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPrivateKey.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPrivateKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
index 056e85cd036..dff2ac5e5bb 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.crypto.mscapi/windows/classes/sun/security/mscapi/CRSACipher.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CRSACipher.java
index 7b2fb631023..692743dfa8b 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CRSACipher.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CRSACipher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/DynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinker.java
index 23f4f7a8122..7e06f49ba41 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinker.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/DynamicLinker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/NamedOperation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/NamedOperation.java
index 5fe3e96f43e..681dc87c137 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/NamedOperation.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/NamedOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/Namespace.java b/src/jdk.dynalink/share/classes/jdk/dynalink/Namespace.java
index 8f5e7ede7f6..a2fea48bc99 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/Namespace.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/Namespace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java
index 0e047849c2c..6a4b074edbb 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/NoSuchDynamicMethodException.java b/src/jdk.dynalink/share/classes/jdk/dynalink/NoSuchDynamicMethodException.java
index 8842c32c1be..9db5492e3d8 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/NoSuchDynamicMethodException.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/NoSuchDynamicMethodException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/Operation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/Operation.java
index ef0acbc3b57..7becca0609f 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/Operation.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/Operation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/RelinkableCallSite.java b/src/jdk.dynalink/share/classes/jdk/dynalink/RelinkableCallSite.java
index e14cfdfebd3..e3ef0850410 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/RelinkableCallSite.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/RelinkableCallSite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/StandardNamespace.java b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardNamespace.java
index b4c33250d38..2d410d54eae 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/StandardNamespace.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardNamespace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/beans/BeansLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeansLinker.java
index ca09923292a..8c035ec262d 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeansLinker.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeansLinker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java
index c860289925e..2d52471399b 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/beans/ClassString.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassString.java
index a892f06e55d..2c7a9ac2d89 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassString.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassString.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/beans/MissingMemberHandlerFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MissingMemberHandlerFactory.java
index c1e2f7eb71d..2558ddac5e1 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MissingMemberHandlerFactory.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/MissingMemberHandlerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java
index ebd6c7e55e2..f8c6a95b2d1 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/internal/InternalTypeUtilities.java b/src/jdk.dynalink/share/classes/jdk/dynalink/internal/InternalTypeUtilities.java
index 8cda7a1e804..71ca232a83c 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/internal/InternalTypeUtilities.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/internal/InternalTypeUtilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/ConversionComparator.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/ConversionComparator.java
index 267752b0a23..c17444eaff6 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/ConversionComparator.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/ConversionComparator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocationTransformer.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocationTransformer.java
index fa4f0cd4545..dbc1fb374a2 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocationTransformer.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocationTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinker.java
index e94cb7b9128..c6b5c54dbc6 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinker.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingDynamicLinker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java
index 56b3c0c8eae..05cdb2ba9ae 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/LinkRequest.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkRequest.java
index 1feeed03d15..cffa77f1963 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkRequest.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/LinkerServices.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkerServices.java
index 409af52f592..c4fbdd6b2c4 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkerServices.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/LinkerServices.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/MethodHandleTransformer.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodHandleTransformer.java
index e9ccd30ffed..a834b5a296f 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodHandleTransformer.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodHandleTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/MethodTypeConversionStrategy.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodTypeConversionStrategy.java
index 394f81858ff..2b3fdf30d6e 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodTypeConversionStrategy.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/MethodTypeConversionStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/TypeBasedGuardingDynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/TypeBasedGuardingDynamicLinker.java
index 1565cfee552..2483e268dfc 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/TypeBasedGuardingDynamicLinker.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/TypeBasedGuardingDynamicLinker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/support/CompositeGuardingDynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeGuardingDynamicLinker.java
index c226a9c0b17..dfb4f130f29 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeGuardingDynamicLinker.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeGuardingDynamicLinker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/support/CompositeTypeBasedGuardingDynamicLinker.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeTypeBasedGuardingDynamicLinker.java
index a0805ff57d6..e2d5ade341c 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeTypeBasedGuardingDynamicLinker.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/CompositeTypeBasedGuardingDynamicLinker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/support/DefaultInternalObjectFilter.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/DefaultInternalObjectFilter.java
index 7a43f7ebbc0..41f4190a3be 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/DefaultInternalObjectFilter.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/DefaultInternalObjectFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/support/Guards.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Guards.java
index 7b0fd0e156b..d8127070930 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Guards.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Guards.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java
index 25792f0108b..83cfea586ca 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/support/SimpleLinkRequest.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/SimpleLinkRequest.java
index 7a00b9fe3ea..30fa42c5e61 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/SimpleLinkRequest.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/SimpleLinkRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/linker/support/TypeUtilities.java b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/TypeUtilities.java
index 2a3d667d49a..f3444aa5b79 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/TypeUtilities.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/TypeUtilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/package-info.java b/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java
index 1218885ae9a..b796470e100 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/support/AbstractRelinkableCallSite.java b/src/jdk.dynalink/share/classes/jdk/dynalink/support/AbstractRelinkableCallSite.java
index 84ecfa1db38..137b2b298c7 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/support/AbstractRelinkableCallSite.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/support/AbstractRelinkableCallSite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/support/ChainedCallSite.java b/src/jdk.dynalink/share/classes/jdk/dynalink/support/ChainedCallSite.java
index 2f75b53fc3d..0c7ebaf7f1f 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/support/ChainedCallSite.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/support/ChainedCallSite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.dynalink/share/classes/jdk/dynalink/support/SimpleRelinkableCallSite.java b/src/jdk.dynalink/share/classes/jdk/dynalink/support/SimpleRelinkableCallSite.java
index 022d6088d01..21291e3640d 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/support/SimpleRelinkableCallSite.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/support/SimpleRelinkableCallSite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/linux/native/libsaproc/ps_proc.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c
index 41207b5a9df..de81e962d8a 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/linux/native/libsaproc/symtab.c b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c
index 4cb791111bc..07cbb46d045 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/DebugServer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/DebugServer.java
index 2813a58c94d..719c6601549 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/DebugServer.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/DebugServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
index b9990828624..ff14e99f3b9 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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.
*
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java
index cac3f0a1f61..9ec60a19f19 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/code/StubQueue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/StubQueue.java
index 8d06a257e62..a1fb2a1e73a 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/StubQueue.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/StubQueue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java
index 7a7c761e89f..a2e6557eaae 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
index 0ce2a4507ae..10f6881d010 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java
index 5bab3d252d0..261df12c8f1 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionManager.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionManager.java
index d1e2a468731..cfec9c87cb3 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionManager.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionSetBase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionSetBase.java
index 5d44c46d013..c5f8cde2303 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionSetBase.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionSetBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
index 864c9319966..ede33b3ba28 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
index 23bbad2c3df..5230afc7a3c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1PrintRegionClosure.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1PrintRegionClosure.java
index 340f40e288d..a9fa4863129 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1PrintRegionClosure.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1PrintRegionClosure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java
index d6bf39775bb..51ada0c662d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
index 3647a951b8d..6260b74c03d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
index c04677cf00d..50b5d27eab4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
index 8c25f54d92c..c1df1df9429 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java
index fd364d6a174..66efbe3484a 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
index 0f05b15af76..e3c35f08991 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java
index edffd56d2cd..1ea34fe6cd2 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Mark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
index be6c8522fc5..a4cdb671959 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
index 825b1bf1437..75ad4ab1d66 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicLock.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicLock.java
index 4028bae3f5b..979e08cfb8a 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicLock.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/BasicLock.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java
index a9c97e06a44..cb82471cf58 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
index 6a8b794a935..c6316df5473 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
index ebcbaa3a773..ea2845f56f5 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2024, 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
@@ -233,29 +233,22 @@ protected HttpExchange() {
public abstract String getProtocol();
/**
- * Returns the attribute's value from this exchange's
- * {@linkplain HttpContext#getAttributes() context attributes}.
- *
- * @apiNote {@link Filter} modules may store arbitrary objects as attributes through
- * {@code HttpExchange} instances as an out-of-band communication mechanism. Other filters
+ * {@link Filter} modules may store arbitrary objects with {@code HttpExchange}
+ * instances as an out-of-band communication mechanism. Other filters
* or the exchange handler may then access these objects.
*
* <p> Each {@code Filter} class will document the attributes which they make
* available.
*
* @param name the name of the attribute to retrieve
- * @return the attribute's value or {@code null} if either the attribute isn't set
- * or the attribute value is {@code null}
+ * @return the attribute object, or {@code null} if it does not exist
* @throws NullPointerException if name is {@code null}
*/
public abstract Object getAttribute(String name);
/**
- * Sets an attribute with the given {@code name} and {@code value} in this exchange's
- * {@linkplain HttpContext#getAttributes() context attributes}.
- *
- * @apiNote {@link Filter} modules may store arbitrary objects as attributes through
- * {@code HttpExchange} instances as an out-of-band communication mechanism. Other filters
+ * {@link Filter} modules may store arbitrary objects with {@code HttpExchange}
+ * instances as an out-of-band communication mechanism. Other filters
* or the exchange handler may then access these objects.
*
* <p> Each {@code Filter} class will document the attributes which they make
diff --git a/src/jdk.httpserver/share/man/jwebserver.md b/src/jdk.httpserver/share/man/jwebserver.md
index 352e982654d..a8d67298406 100644
--- a/src/jdk.httpserver/share/man/jwebserver.md
+++ b/src/jdk.httpserver/share/man/jwebserver.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.incubator.vector/linux/native/libsleef/lib/vector_math_neon.c b/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_neon.c
index de289d4ffc5..efd5443607b 100644
--- a/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_neon.c
+++ b/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_neon.c
@@ -4,7 +4,9 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_rvv.c b/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_rvv.c
index 438ca0c92ba..c0972ee6db1 100644
--- a/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_rvv.c
+++ b/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_rvv.c
@@ -4,7 +4,9 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_sve.c b/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_sve.c
index 1a442761d51..4c80f9f7d37 100644
--- a/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_sve.c
+++ b/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_sve.c
@@ -4,7 +4,9 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
index fc39cb6adac..155853a86f9 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,53 +26,16 @@
import java.util.function.IntUnaryOperator;
import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.vector.VectorSupport;
abstract class AbstractShuffle<E> extends VectorShuffle<E> {
static final IntUnaryOperator IDENTITY = i -> i;
- // Internal representation allows for a maximum index of 256
+ // Internal representation allows for a maximum index of E.MAX_VALUE - 1
// Values are clipped to [-VLENGTH..VLENGTH-1].
- AbstractShuffle(int length, byte[] reorder) {
- super(reorder);
- assert(length == reorder.length);
- assert(indexesInRange(reorder));
- }
-
- AbstractShuffle(int length, int[] reorder) {
- this(length, reorder, 0);
- }
-
- AbstractShuffle(int length, int[] reorder, int offset) {
- super(prepare(length, reorder, offset));
- }
-
- AbstractShuffle(int length, IntUnaryOperator f) {
- super(prepare(length, f));
- }
-
- private static byte[] prepare(int length, int[] reorder, int offset) {
- byte[] a = new byte[length];
- for (int i = 0; i < length; i++) {
- int si = reorder[offset + i];
- si = partiallyWrapIndex(si, length);
- a[i] = (byte) si;
- }
- return a;
- }
-
- private static byte[] prepare(int length, IntUnaryOperator f) {
- byte[] a = new byte[length];
- for (int i = 0; i < a.length; i++) {
- int si = f.applyAsInt(i);
- si = partiallyWrapIndex(si, length);
- a[i] = (byte) si;
- }
- return a;
- }
-
- byte[] reorder() {
- return (byte[])getPayload();
+ AbstractShuffle(Object indices) {
+ super(indices);
}
/*package-private*/
@@ -84,91 +47,55 @@ public final VectorSpecies<E> vectorSpecies() {
return vspecies();
}
- @Override
+ /*package-private*/
+ abstract AbstractVector<?> toBitsVector();
+
@ForceInline
- public void intoArray(int[] a, int offset) {
- byte[] reorder = reorder();
- int vlen = reorder.length;
- for (int i = 0; i < vlen; i++) {
- int sourceIndex = reorder[i];
- assert(sourceIndex >= -vlen && sourceIndex < vlen);
- a[offset + i] = sourceIndex;
- }
+ final AbstractVector<?> toBitsVectorTemplate() {
+ AbstractSpecies<?> dsp = vspecies().asIntegral();
+ Class<?> etype = dsp.elementType();
+ Class<?> rvtype = dsp.dummyVector().getClass();
+ return VectorSupport.convert(VectorSupport.VECTOR_OP_REINTERPRET,
+ getClass(), etype, length(),
+ rvtype, etype, length(),
+ this, dsp,
+ (v, s) -> v.toBitsVector0());
}
+ abstract AbstractVector<?> toBitsVector0();
+
@Override
@ForceInline
- public int[] toArray() {
- byte[] reorder = reorder();
- int[] a = new int[reorder.length];
- intoArray(a, 0);
- return a;
+ public final int[] toArray() {
+ int[] res = new int[length()];
+ intoArray(res, 0);
+ return res;
}
- /*package-private*/
+ @Override
@ForceInline
- final
- AbstractVector<E>
- toVectorTemplate() {
- // Note that the values produced by laneSource
- // are already clipped. At this point we convert
- // them from internal ints (or bytes) into the ETYPE.
- // FIXME: Use a conversion intrinsic for this operation.
- // https://bugs.openjdk.org/browse/JDK-8225740
- return (AbstractVector<E>) vspecies().fromIntValues(toArray());
+ public final <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
+ if (length() != s.length()) {
+ throw new IllegalArgumentException("VectorShuffle length and species length differ");
+ }
+ return toBitsVector().bitsToShuffle((AbstractSpecies<F>) s);
}
+ @Override
@ForceInline
public final VectorShuffle<E> checkIndexes() {
if (VectorIntrinsics.VECTOR_ACCESS_OOB_CHECK == 0) {
return this;
}
- Vector<E> shufvec = this.toVector();
- VectorMask<E> vecmask = shufvec.compare(VectorOperators.LT, vspecies().zero());
- if (vecmask.anyTrue()) {
- byte[] reorder = reorder();
- throw checkIndexFailed(reorder[vecmask.firstTrue()], length());
- }
- return this;
- }
-
- @ForceInline
- public final VectorShuffle<E> wrapIndexesTemplate() {
- Vector<E> shufvec = this.toVector();
- VectorMask<E> vecmask = shufvec.compare(VectorOperators.LT, vspecies().zero());
+ Vector<?> shufvec = this.toBitsVector();
+ VectorMask<?> vecmask = shufvec.compare(VectorOperators.LT, 0);
if (vecmask.anyTrue()) {
- // FIXME: vectorize this
- byte[] reorder = reorder();
- return wrapAndRebuild(reorder);
+ int[] indices = toArray();
+ throw checkIndexFailed(indices[vecmask.firstTrue()], length());
}
return this;
}
- @ForceInline
- public final VectorShuffle<E> wrapAndRebuild(byte[] oldReorder) {
- int length = oldReorder.length;
- byte[] reorder = new byte[length];
- for (int i = 0; i < length; i++) {
- int si = oldReorder[i];
- // FIXME: This does not work unless it's a power of 2.
- if ((length & (length - 1)) == 0) {
- si += si & length; // power-of-two optimization
- } else if (si < 0) {
- // non-POT code requires a conditional add
- si += length;
- }
- assert(si >= 0 && si < length);
- reorder[i] = (byte) si;
- }
- return vspecies().dummyVector().shuffleFromBytes(reorder);
- }
-
- @ForceInline
- public final VectorMask<E> laneIsValid() {
- Vector<E> shufvec = this.toVector();
- return shufvec.compare(VectorOperators.GE, vspecies().zero());
- }
-
@Override
@ForceInline
@SuppressWarnings("unchecked")
@@ -220,21 +147,4 @@ private static IndexOutOfBoundsException checkIndexFailed(int index, int laneCou
String msg = "required an index in [0.."+max+"] but found "+index;
return new IndexOutOfBoundsException(msg);
}
-
- static boolean indexesInRange(byte[] reorder) {
- int length = reorder.length;
- for (byte si : reorder) {
- if (si >= length || si < -length) {
- boolean assertsEnabled = false;
- assert(assertsEnabled = true);
- if (assertsEnabled) {
- String msg = ("index "+si+"out of range ["+length+"] in "+
- java.util.Arrays.toString(reorder));
- throw new AssertionError(msg);
- }
- return false;
- }
- }
- return true;
- }
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java
index 0ff4830ded5..bdc72c64ce5 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java
@@ -48,6 +48,8 @@ abstract class AbstractSpecies<E> extends jdk.internal.vm.vector.VectorSupport.V
@Stable
final Class<? extends AbstractMask<E>> maskType;
@Stable
+ final Class<? extends AbstractShuffle<E>> shuffleType;
+ @Stable
final Function<Object, ? extends AbstractVector<E>> vectorFactory;
@Stable
@@ -61,11 +63,13 @@ abstract class AbstractSpecies<E> extends jdk.internal.vm.vector.VectorSupport.V
LaneType laneType,
Class<? extends AbstractVector<E>> vectorType,
Class<? extends AbstractMask<E>> maskType,
+ Class<? extends AbstractShuffle<E>> shuffleType,
Function<Object, ? extends AbstractVector<E>> vectorFactory) {
this.vectorShape = vectorShape;
this.laneType = laneType;
this.vectorType = vectorType;
this.maskType = maskType;
+ this.shuffleType = shuffleType;
this.vectorFactory = vectorFactory;
// derived values:
@@ -162,6 +166,11 @@ public final Class<? extends AbstractMask<E>> maskType() {
return maskType;
}
+ @ForceInline
+ final Class<? extends AbstractShuffle<E>> shuffleType() {
+ return shuffleType;
+ }
+
@Override
@ForceInline
public final int elementSize() {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
index 64d681e4aee..867d74dd6b3 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -194,12 +194,43 @@ ByteVector asByteVectorRawTemplate() {
abstract AbstractMask<E> maskFromArray(boolean[] bits);
+ abstract <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp);
+
+ /*package-private*/
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffleTemplate(AbstractSpecies<F> dsp) {
+ Class<?> etype = vspecies().elementType();
+ Class<?> dvtype = dsp.shuffleType();
+ Class<?> dtype = dsp.asIntegral().elementType();
+ int dlength = dsp.dummyVector().length();
+ return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
+ getClass(), etype, length(),
+ dvtype, dtype, dlength,
+ this, dsp,
+ AbstractVector::bitsToShuffle0);
+ }
+
+ abstract <F> VectorShuffle<F> bitsToShuffle0(AbstractSpecies<F> dsp);
+
+ abstract <F> VectorShuffle<F> toShuffle(AbstractSpecies<F> dsp, boolean wrap);
+
abstract AbstractShuffle<E> iotaShuffle();
abstract AbstractShuffle<E> iotaShuffle(int start, int step, boolean wrap);
- /*do not alias this byte array*/
- abstract AbstractShuffle<E> shuffleFromBytes(byte[] reorder);
+ @ForceInline
+ final VectorShuffle<E> iotaShuffleTemplate(int start, int step, boolean wrap) {
+ if ((length() & (length() - 1)) != 0) {
+ // Uncommon path, the length is not a power of 2
+ return wrap ? shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i * step + start, length())))
+ : shuffleFromOp(i -> i * step + start);
+ }
+
+ AbstractVector<?> iota = vspecies().asIntegral().iota();
+ iota = (AbstractVector<?>) iota.lanewise(VectorOperators.MUL, step)
+ .lanewise(VectorOperators.ADD, start);
+ return iota.toShuffle(vspecies(), wrap);
+ }
abstract AbstractShuffle<E> shuffleFromArray(int[] indexes, int i);
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
index 3cf25d46f44..a71a6212295 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
@@ -141,24 +141,15 @@ Byte128Mask maskFromArray(boolean[] bits) {
@ForceInline
Byte128Shuffle iotaShuffle() { return Byte128Shuffle.IOTA; }
+ @Override
@ForceInline
Byte128Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Byte128Shuffle)VectorSupport.shuffleIota(ETYPE, Byte128Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Byte128Shuffle)VectorSupport.shuffleIota(ETYPE, Byte128Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Byte128Shuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
}
@Override
@ForceInline
- Byte128Shuffle shuffleFromBytes(byte[] reorder) { return new Byte128Shuffle(reorder); }
-
- @Override
- @ForceInline
- Byte128Shuffle shuffleFromArray(int[] indexes, int i) { return new Byte128Shuffle(indexes, i); }
+ Byte128Shuffle shuffleFromArray(int[] indices, int i) { return new Byte128Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Byte128Mask.class, (Byte128Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Byte> toShuffle() {
- return super.toShuffleTemplate(Byte128Shuffle.class); // specialize
+ public final Byte128Shuffle toShuffle() {
+ return (Byte128Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -821,23 +819,26 @@ static final class Byte128Shuffle extends AbstractShuffle<Byte> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Byte> ETYPE = byte.class; // used by the JVM
- Byte128Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Byte128Shuffle(byte[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Byte128Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Byte128Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Byte128Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Byte128Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Byte128Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ byte[] indices() {
+ return (byte[])getPayload();
}
@Override
+ @ForceInline
public ByteSpecies vspecies() {
return VSPECIES;
}
@@ -853,39 +854,103 @@ public ByteSpecies vspecies() {
@Override
@ForceInline
public Byte128Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Byte128Shuffle.class, this, VLENGTH,
- (s) -> ((Byte128Vector)(((AbstractShuffle<Byte>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Byte128Vector toBitsVector() {
+ return (Byte128Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Byte128Vector toBitsVector0() {
+ return ((Byte128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Byte128Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Byte128Shuffle.class, this, VLENGTH,
- (s) -> ((Byte128Shuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_128;
+ Vector<Byte> v = toBitsVector();
+ v.convertShape(VectorOperators.B2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.B2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ v.convertShape(VectorOperators.B2I, species, 2)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 2);
+ v.convertShape(VectorOperators.B2I, species, 3)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 3);
+ }
+
@Override
- public Byte128Shuffle rearrange(VectorShuffle<Byte> shuffle) {
- Byte128Shuffle s = (Byte128Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Byte128Mask laneIsValid() {
+ return (Byte128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Byte128Shuffle rearrange(VectorShuffle<Byte> shuffle) {
+ Byte128Shuffle concreteShuffle = (Byte128Shuffle) shuffle;
+ return (Byte128Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Byte128Shuffle wrapIndexes() {
+ Byte128Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Byte128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Byte128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Byte128Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static byte[] prepare(int[] indices, int offset) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static byte[] prepare(IntUnaryOperator f) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(byte[] indices) {
+ int length = indices.length;
+ for (byte si : indices) {
+ if (si >= (byte)length || si < (byte)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Byte128Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
index cb9f2679dca..828c8bcb905 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
@@ -141,24 +141,15 @@ Byte256Mask maskFromArray(boolean[] bits) {
@ForceInline
Byte256Shuffle iotaShuffle() { return Byte256Shuffle.IOTA; }
+ @Override
@ForceInline
Byte256Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Byte256Shuffle)VectorSupport.shuffleIota(ETYPE, Byte256Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Byte256Shuffle)VectorSupport.shuffleIota(ETYPE, Byte256Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Byte256Shuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
}
@Override
@ForceInline
- Byte256Shuffle shuffleFromBytes(byte[] reorder) { return new Byte256Shuffle(reorder); }
-
- @Override
- @ForceInline
- Byte256Shuffle shuffleFromArray(int[] indexes, int i) { return new Byte256Shuffle(indexes, i); }
+ Byte256Shuffle shuffleFromArray(int[] indices, int i) { return new Byte256Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Byte256Mask.class, (Byte256Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Byte> toShuffle() {
- return super.toShuffleTemplate(Byte256Shuffle.class); // specialize
+ public final Byte256Shuffle toShuffle() {
+ return (Byte256Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -853,23 +851,26 @@ static final class Byte256Shuffle extends AbstractShuffle<Byte> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Byte> ETYPE = byte.class; // used by the JVM
- Byte256Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Byte256Shuffle(byte[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Byte256Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Byte256Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Byte256Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Byte256Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Byte256Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ byte[] indices() {
+ return (byte[])getPayload();
}
@Override
+ @ForceInline
public ByteSpecies vspecies() {
return VSPECIES;
}
@@ -885,39 +886,103 @@ public ByteSpecies vspecies() {
@Override
@ForceInline
public Byte256Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Byte256Shuffle.class, this, VLENGTH,
- (s) -> ((Byte256Vector)(((AbstractShuffle<Byte>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Byte256Vector toBitsVector() {
+ return (Byte256Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Byte256Vector toBitsVector0() {
+ return ((Byte256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Byte256Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Byte256Shuffle.class, this, VLENGTH,
- (s) -> ((Byte256Shuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_256;
+ Vector<Byte> v = toBitsVector();
+ v.convertShape(VectorOperators.B2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.B2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ v.convertShape(VectorOperators.B2I, species, 2)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 2);
+ v.convertShape(VectorOperators.B2I, species, 3)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 3);
+ }
+
@Override
- public Byte256Shuffle rearrange(VectorShuffle<Byte> shuffle) {
- Byte256Shuffle s = (Byte256Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Byte256Mask laneIsValid() {
+ return (Byte256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Byte256Shuffle rearrange(VectorShuffle<Byte> shuffle) {
+ Byte256Shuffle concreteShuffle = (Byte256Shuffle) shuffle;
+ return (Byte256Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Byte256Shuffle wrapIndexes() {
+ Byte256Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Byte256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Byte256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Byte256Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static byte[] prepare(int[] indices, int offset) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static byte[] prepare(IntUnaryOperator f) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(byte[] indices) {
+ int length = indices.length;
+ for (byte si : indices) {
+ if (si >= (byte)length || si < (byte)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Byte256Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
index f5ff0575703..a5c32ff6b1f 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
@@ -141,24 +141,15 @@ Byte512Mask maskFromArray(boolean[] bits) {
@ForceInline
Byte512Shuffle iotaShuffle() { return Byte512Shuffle.IOTA; }
+ @Override
@ForceInline
Byte512Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Byte512Shuffle)VectorSupport.shuffleIota(ETYPE, Byte512Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Byte512Shuffle)VectorSupport.shuffleIota(ETYPE, Byte512Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Byte512Shuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
}
@Override
@ForceInline
- Byte512Shuffle shuffleFromBytes(byte[] reorder) { return new Byte512Shuffle(reorder); }
-
- @Override
- @ForceInline
- Byte512Shuffle shuffleFromArray(int[] indexes, int i) { return new Byte512Shuffle(indexes, i); }
+ Byte512Shuffle shuffleFromArray(int[] indices, int i) { return new Byte512Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Byte512Mask.class, (Byte512Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Byte> toShuffle() {
- return super.toShuffleTemplate(Byte512Shuffle.class); // specialize
+ public final Byte512Shuffle toShuffle() {
+ return (Byte512Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -917,23 +915,26 @@ static final class Byte512Shuffle extends AbstractShuffle<Byte> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Byte> ETYPE = byte.class; // used by the JVM
- Byte512Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Byte512Shuffle(byte[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Byte512Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Byte512Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Byte512Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Byte512Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Byte512Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ byte[] indices() {
+ return (byte[])getPayload();
}
@Override
+ @ForceInline
public ByteSpecies vspecies() {
return VSPECIES;
}
@@ -949,39 +950,103 @@ public ByteSpecies vspecies() {
@Override
@ForceInline
public Byte512Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Byte512Shuffle.class, this, VLENGTH,
- (s) -> ((Byte512Vector)(((AbstractShuffle<Byte>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Byte512Vector toBitsVector() {
+ return (Byte512Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Byte512Vector toBitsVector0() {
+ return ((Byte512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Byte512Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Byte512Shuffle.class, this, VLENGTH,
- (s) -> ((Byte512Shuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_512;
+ Vector<Byte> v = toBitsVector();
+ v.convertShape(VectorOperators.B2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.B2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ v.convertShape(VectorOperators.B2I, species, 2)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 2);
+ v.convertShape(VectorOperators.B2I, species, 3)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 3);
+ }
+
@Override
- public Byte512Shuffle rearrange(VectorShuffle<Byte> shuffle) {
- Byte512Shuffle s = (Byte512Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Byte512Mask laneIsValid() {
+ return (Byte512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Byte512Shuffle rearrange(VectorShuffle<Byte> shuffle) {
+ Byte512Shuffle concreteShuffle = (Byte512Shuffle) shuffle;
+ return (Byte512Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Byte512Shuffle wrapIndexes() {
+ Byte512Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Byte512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Byte512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Byte512Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static byte[] prepare(int[] indices, int offset) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static byte[] prepare(IntUnaryOperator f) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(byte[] indices) {
+ int length = indices.length;
+ for (byte si : indices) {
+ if (si >= (byte)length || si < (byte)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Byte512Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
index 37e8978d7e8..222e6ec5e39 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
@@ -141,24 +141,15 @@ Byte64Mask maskFromArray(boolean[] bits) {
@ForceInline
Byte64Shuffle iotaShuffle() { return Byte64Shuffle.IOTA; }
+ @Override
@ForceInline
Byte64Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Byte64Shuffle)VectorSupport.shuffleIota(ETYPE, Byte64Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Byte64Shuffle)VectorSupport.shuffleIota(ETYPE, Byte64Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Byte64Shuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
}
@Override
@ForceInline
- Byte64Shuffle shuffleFromBytes(byte[] reorder) { return new Byte64Shuffle(reorder); }
-
- @Override
- @ForceInline
- Byte64Shuffle shuffleFromArray(int[] indexes, int i) { return new Byte64Shuffle(indexes, i); }
+ Byte64Shuffle shuffleFromArray(int[] indices, int i) { return new Byte64Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Byte64Mask.class, (Byte64Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Byte> toShuffle() {
- return super.toShuffleTemplate(Byte64Shuffle.class); // specialize
+ public final Byte64Shuffle toShuffle() {
+ return (Byte64Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -805,23 +803,26 @@ static final class Byte64Shuffle extends AbstractShuffle<Byte> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Byte> ETYPE = byte.class; // used by the JVM
- Byte64Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Byte64Shuffle(byte[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Byte64Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Byte64Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Byte64Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Byte64Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Byte64Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ byte[] indices() {
+ return (byte[])getPayload();
}
@Override
+ @ForceInline
public ByteSpecies vspecies() {
return VSPECIES;
}
@@ -837,39 +838,103 @@ public ByteSpecies vspecies() {
@Override
@ForceInline
public Byte64Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Byte64Shuffle.class, this, VLENGTH,
- (s) -> ((Byte64Vector)(((AbstractShuffle<Byte>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Byte64Vector toBitsVector() {
+ return (Byte64Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Byte64Vector toBitsVector0() {
+ return ((Byte64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Byte64Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Byte64Shuffle.class, this, VLENGTH,
- (s) -> ((Byte64Shuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_64;
+ Vector<Byte> v = toBitsVector();
+ v.convertShape(VectorOperators.B2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.B2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ v.convertShape(VectorOperators.B2I, species, 2)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 2);
+ v.convertShape(VectorOperators.B2I, species, 3)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 3);
+ }
+
@Override
- public Byte64Shuffle rearrange(VectorShuffle<Byte> shuffle) {
- Byte64Shuffle s = (Byte64Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Byte64Mask laneIsValid() {
+ return (Byte64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Byte64Shuffle rearrange(VectorShuffle<Byte> shuffle) {
+ Byte64Shuffle concreteShuffle = (Byte64Shuffle) shuffle;
+ return (Byte64Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Byte64Shuffle wrapIndexes() {
+ Byte64Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Byte64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Byte64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Byte64Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static byte[] prepare(int[] indices, int offset) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static byte[] prepare(IntUnaryOperator f) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(byte[] indices) {
+ int length = indices.length;
+ for (byte si : indices) {
+ if (si >= (byte)length || si < (byte)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Byte64Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
index 17dcf193ceb..774b351bebb 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
@@ -141,24 +141,15 @@ ByteMaxMask maskFromArray(boolean[] bits) {
@ForceInline
ByteMaxShuffle iotaShuffle() { return ByteMaxShuffle.IOTA; }
+ @Override
@ForceInline
ByteMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (ByteMaxShuffle)VectorSupport.shuffleIota(ETYPE, ByteMaxShuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (ByteMaxShuffle)VectorSupport.shuffleIota(ETYPE, ByteMaxShuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (ByteMaxShuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
}
@Override
@ForceInline
- ByteMaxShuffle shuffleFromBytes(byte[] reorder) { return new ByteMaxShuffle(reorder); }
-
- @Override
- @ForceInline
- ByteMaxShuffle shuffleFromArray(int[] indexes, int i) { return new ByteMaxShuffle(indexes, i); }
+ ByteMaxShuffle shuffleFromArray(int[] indices, int i) { return new ByteMaxShuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, ByteMaxMask.class, (ByteMaxMask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Byte> toShuffle() {
- return super.toShuffleTemplate(ByteMaxShuffle.class); // specialize
+ public final ByteMaxShuffle toShuffle() {
+ return (ByteMaxShuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -791,23 +789,26 @@ static final class ByteMaxShuffle extends AbstractShuffle<Byte> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Byte> ETYPE = byte.class; // used by the JVM
- ByteMaxShuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ ByteMaxShuffle(byte[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public ByteMaxShuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ ByteMaxShuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public ByteMaxShuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ ByteMaxShuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public ByteMaxShuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ byte[] indices() {
+ return (byte[])getPayload();
}
@Override
+ @ForceInline
public ByteSpecies vspecies() {
return VSPECIES;
}
@@ -823,39 +824,103 @@ public ByteSpecies vspecies() {
@Override
@ForceInline
public ByteMaxVector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, ByteMaxShuffle.class, this, VLENGTH,
- (s) -> ((ByteMaxVector)(((AbstractShuffle<Byte>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ ByteMaxVector toBitsVector() {
+ return (ByteMaxVector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ ByteMaxVector toBitsVector0() {
+ return ((ByteMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public ByteMaxShuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, ByteMaxShuffle.class, this, VLENGTH,
- (s) -> ((ByteMaxShuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_MAX;
+ Vector<Byte> v = toBitsVector();
+ v.convertShape(VectorOperators.B2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.B2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ v.convertShape(VectorOperators.B2I, species, 2)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 2);
+ v.convertShape(VectorOperators.B2I, species, 3)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 3);
+ }
+
@Override
- public ByteMaxShuffle rearrange(VectorShuffle<Byte> shuffle) {
- ByteMaxShuffle s = (ByteMaxShuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final ByteMaxMask laneIsValid() {
+ return (ByteMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final ByteMaxShuffle rearrange(VectorShuffle<Byte> shuffle) {
+ ByteMaxShuffle concreteShuffle = (ByteMaxShuffle) shuffle;
+ return (ByteMaxShuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final ByteMaxShuffle wrapIndexes() {
+ ByteMaxVector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (ByteMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (ByteMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (ByteMaxShuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static byte[] prepare(int[] indices, int offset) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static byte[] prepare(IntUnaryOperator f) {
+ byte[] a = new byte[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (byte)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(byte[] indices) {
+ int length = indices.length;
+ for (byte si : indices) {
+ if (si >= (byte)length || si < (byte)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new ByteMaxShuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
index 346b00eda5e..eab5d5c15ae 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
@@ -1096,7 +1096,7 @@ private static VectorBroadcastIntOp<ByteVector, VectorMask<Byte>> broadcastIntOp
// and broadcast, but it would be more surprising not to continue
// the obvious pattern started by unary and binary.
- /**
+ /**
* {@inheritDoc} <!--workaround-->
* @see #lanewise(VectorOperators.Ternary,byte,byte,VectorMask)
* @see #lanewise(VectorOperators.Ternary,Vector,byte,VectorMask)
@@ -2308,9 +2308,10 @@ ByteVector sliceTemplate(int origin, Vector<Byte> v1) {
ByteVector that = (ByteVector) v1;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Byte> iota = iotaShuffle();
- VectorMask<Byte> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((byte)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ ByteVector iotaVector = (ByteVector) iotaShuffle().toBitsVector();
+ ByteVector filter = broadcast((byte)(length() - origin));
+ VectorMask<Byte> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+ AbstractShuffle<Byte> iota = iotaShuffle(origin, 1, true);
return that.rearrange(iota).blend(this.rearrange(iota), blendMask);
}
@@ -2338,9 +2339,10 @@ ByteVector slice(int origin,
@ForceInline
ByteVector sliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Byte> iota = iotaShuffle();
- VectorMask<Byte> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((byte)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ ByteVector iotaVector = (ByteVector) iotaShuffle().toBitsVector();
+ ByteVector filter = broadcast((byte)(length() - origin));
+ VectorMask<Byte> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+ AbstractShuffle<Byte> iota = iotaShuffle(origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2359,10 +2361,10 @@ ByteVector sliceTemplate(int origin) {
ByteVector that = (ByteVector) w;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Byte> iota = iotaShuffle();
- VectorMask<Byte> blendMask = iota.toVector().compare((part == 0) ? VectorOperators.GE : VectorOperators.LT,
- (broadcast((byte)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ ByteVector iotaVector = (ByteVector) iotaShuffle().toBitsVector();
+ ByteVector filter = broadcast((byte)origin);
+ VectorMask<Byte> blendMask = iotaVector.compare((part == 0) ? VectorOperators.GE : VectorOperators.LT, filter);
+ AbstractShuffle<Byte> iota = iotaShuffle(-origin, 1, true);
return that.blend(this.rearrange(iota), blendMask);
}
@@ -2399,10 +2401,10 @@ ByteVector sliceTemplate(int origin) {
ByteVector
unsliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Byte> iota = iotaShuffle();
- VectorMask<Byte> blendMask = iota.toVector().compare(VectorOperators.GE,
- (broadcast((byte)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ ByteVector iotaVector = (ByteVector) iotaShuffle().toBitsVector();
+ ByteVector filter = broadcast((byte)origin);
+ VectorMask<Byte> blendMask = iotaVector.compare(VectorOperators.GE, filter);
+ AbstractShuffle<Byte> iota = iotaShuffle(-origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2425,13 +2427,11 @@ ByteVector sliceTemplate(int origin) {
final
<S extends VectorShuffle<Byte>>
ByteVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, null, byte.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
}
@@ -2454,13 +2454,11 @@ ByteVector rearrangeTemplate(Class<S> shuffletype,
M m) {
m.check(masktype, this);
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, masktype, byte.class, length(),
- this, ws, m,
+ this, shuffle, m,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return !m_.laneIsSet(i) ? 0 : v1.lane(ei);
}));
}
@@ -2481,30 +2479,29 @@ ByteVector rearrangeTemplate(Class<S> shuffletype,
S shuffle,
ByteVector v) {
VectorMask<Byte> valid = shuffle.laneIsValid();
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
ByteVector r0 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, byte.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v0, s_, m_) -> v0.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
return v0.lane(ei);
}));
ByteVector r1 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, byte.class, length(),
- v, ws, null,
+ v, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
return r1.blend(r0, valid);
}
+ @Override
@ForceInline
- private final
- VectorShuffle<Byte> toShuffle0(ByteSpecies dsp) {
+ final <F> VectorShuffle<F> bitsToShuffle0(AbstractSpecies<F> dsp) {
+ assert(dsp.length() == vspecies().length());
byte[] a = toArray();
int[] sa = new int[a.length];
for (int i = 0; i < a.length; i++) {
@@ -2513,16 +2510,18 @@ VectorShuffle<Byte> toShuffle0(ByteSpecies dsp) {
return VectorShuffle.fromArray(dsp, sa, 0);
}
- /*package-private*/
@ForceInline
- final
- VectorShuffle<Byte> toShuffleTemplate(Class<?> shuffleType) {
- ByteSpecies vsp = vspecies();
- return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
- getClass(), byte.class, length(),
- shuffleType, byte.class, length(),
- this, vsp,
- ByteVector::toShuffle0);
+ final <F>
+ VectorShuffle<F> toShuffle(AbstractSpecies<F> dsp, boolean wrap) {
+ assert(dsp.elementSize() == vspecies().elementSize());
+ ByteVector idx = this;
+ ByteVector wrapped = idx.lanewise(VectorOperators.AND, length() - 1);
+ if (!wrap) {
+ ByteVector wrappedEx = wrapped.lanewise(VectorOperators.SUB, length());
+ VectorMask<Byte> inBound = wrapped.compare(VectorOperators.EQ, idx);
+ wrapped = wrappedEx.blend(wrapped, inBound);
+ }
+ return wrapped.bitsToShuffle(dsp);
}
/**
@@ -4216,9 +4215,10 @@ static final class ByteSpecies extends AbstractSpecies<Byte> {
private ByteSpecies(VectorShape shape,
Class<? extends ByteVector> vectorType,
Class<? extends AbstractMask<Byte>> maskType,
+ Class<? extends AbstractShuffle<Byte>> shuffleType,
Function<Object, ByteVector> vectorFactory) {
super(shape, LaneType.of(byte.class),
- vectorType, maskType,
+ vectorType, maskType, shuffleType,
vectorFactory);
assert(this.elementSize() == Byte.SIZE);
}
@@ -4504,6 +4504,7 @@ static ByteSpecies species(VectorShape s) {
= new ByteSpecies(VectorShape.S_64_BIT,
Byte64Vector.class,
Byte64Vector.Byte64Mask.class,
+ Byte64Vector.Byte64Shuffle.class,
Byte64Vector::new);
/** Species representing {@link ByteVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
@@ -4511,6 +4512,7 @@ static ByteSpecies species(VectorShape s) {
= new ByteSpecies(VectorShape.S_128_BIT,
Byte128Vector.class,
Byte128Vector.Byte128Mask.class,
+ Byte128Vector.Byte128Shuffle.class,
Byte128Vector::new);
/** Species representing {@link ByteVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
@@ -4518,6 +4520,7 @@ static ByteSpecies species(VectorShape s) {
= new ByteSpecies(VectorShape.S_256_BIT,
Byte256Vector.class,
Byte256Vector.Byte256Mask.class,
+ Byte256Vector.Byte256Shuffle.class,
Byte256Vector::new);
/** Species representing {@link ByteVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
@@ -4525,6 +4528,7 @@ static ByteSpecies species(VectorShape s) {
= new ByteSpecies(VectorShape.S_512_BIT,
Byte512Vector.class,
Byte512Vector.Byte512Mask.class,
+ Byte512Vector.Byte512Shuffle.class,
Byte512Vector::new);
/** Species representing {@link ByteVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
@@ -4532,6 +4536,7 @@ static ByteSpecies species(VectorShape s) {
= new ByteSpecies(VectorShape.S_Max_BIT,
ByteMaxVector.class,
ByteMaxVector.ByteMaxMask.class,
+ ByteMaxVector.ByteMaxShuffle.class,
ByteMaxVector::new);
/**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
index 37607492645..7d343d4e244 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
@@ -141,24 +141,15 @@ Double128Mask maskFromArray(boolean[] bits) {
@ForceInline
Double128Shuffle iotaShuffle() { return Double128Shuffle.IOTA; }
+ @Override
@ForceInline
Double128Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Double128Shuffle)VectorSupport.shuffleIota(ETYPE, Double128Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Double128Shuffle)VectorSupport.shuffleIota(ETYPE, Double128Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Double128Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Double128Shuffle shuffleFromBytes(byte[] reorder) { return new Double128Shuffle(reorder); }
-
- @Override
- @ForceInline
- Double128Shuffle shuffleFromArray(int[] indexes, int i) { return new Double128Shuffle(indexes, i); }
+ Double128Shuffle shuffleFromArray(int[] indices, int i) { return new Double128Shuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Double128Mask.class, (Double128Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Double> toShuffle() {
- return super.toShuffleTemplate(Double128Shuffle.class); // specialize
+ public final Double128Shuffle toShuffle() {
+ return (Double128Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -780,25 +778,28 @@ static Double128Mask maskAll(boolean bit) {
static final class Double128Shuffle extends AbstractShuffle<Double> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Double> ETYPE = double.class; // used by the JVM
+ static final Class<Long> ETYPE = long.class; // used by the JVM
- Double128Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Double128Shuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Double128Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Double128Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Double128Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Double128Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Double128Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public DoubleSpecies vspecies() {
return VSPECIES;
}
@@ -806,47 +807,122 @@ public DoubleSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final Double128Shuffle IOTA = new Double128Shuffle(IDENTITY);
@Override
@ForceInline
public Double128Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Double128Shuffle.class, this, VLENGTH,
- (s) -> ((Double128Vector)(((AbstractShuffle<Double>)(s)).toVectorTemplate())));
+ return (Double128Vector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Long128Vector toBitsVector() {
+ return (Long128Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Long128Vector toBitsVector0() {
+ return ((Long128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Double128Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Double128Shuffle.class, this, VLENGTH,
- (s) -> ((Double128Shuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
@Override
- public Double128Shuffle rearrange(VectorShuffle<Double> shuffle) {
- Double128Shuffle s = (Double128Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Double128Mask laneIsValid() {
+ return (Double128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Double128Shuffle rearrange(VectorShuffle<Double> shuffle) {
+ Double128Shuffle concreteShuffle = (Double128Shuffle) shuffle;
+ return (Double128Shuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_128))
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Double128Shuffle wrapIndexes() {
+ Long128Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Long128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Long128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Double128Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Double128Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
index 2e31a802550..a8645badc27 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
@@ -141,24 +141,15 @@ Double256Mask maskFromArray(boolean[] bits) {
@ForceInline
Double256Shuffle iotaShuffle() { return Double256Shuffle.IOTA; }
+ @Override
@ForceInline
Double256Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Double256Shuffle)VectorSupport.shuffleIota(ETYPE, Double256Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Double256Shuffle)VectorSupport.shuffleIota(ETYPE, Double256Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Double256Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Double256Shuffle shuffleFromBytes(byte[] reorder) { return new Double256Shuffle(reorder); }
-
- @Override
- @ForceInline
- Double256Shuffle shuffleFromArray(int[] indexes, int i) { return new Double256Shuffle(indexes, i); }
+ Double256Shuffle shuffleFromArray(int[] indices, int i) { return new Double256Shuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Double256Mask.class, (Double256Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Double> toShuffle() {
- return super.toShuffleTemplate(Double256Shuffle.class); // specialize
+ public final Double256Shuffle toShuffle() {
+ return (Double256Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -784,25 +782,28 @@ static Double256Mask maskAll(boolean bit) {
static final class Double256Shuffle extends AbstractShuffle<Double> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Double> ETYPE = double.class; // used by the JVM
+ static final Class<Long> ETYPE = long.class; // used by the JVM
- Double256Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Double256Shuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Double256Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Double256Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Double256Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Double256Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Double256Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public DoubleSpecies vspecies() {
return VSPECIES;
}
@@ -810,47 +811,122 @@ public DoubleSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final Double256Shuffle IOTA = new Double256Shuffle(IDENTITY);
@Override
@ForceInline
public Double256Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Double256Shuffle.class, this, VLENGTH,
- (s) -> ((Double256Vector)(((AbstractShuffle<Double>)(s)).toVectorTemplate())));
+ return (Double256Vector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Long256Vector toBitsVector() {
+ return (Long256Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Long256Vector toBitsVector0() {
+ return ((Long256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Double256Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Double256Shuffle.class, this, VLENGTH,
- (s) -> ((Double256Shuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
@Override
- public Double256Shuffle rearrange(VectorShuffle<Double> shuffle) {
- Double256Shuffle s = (Double256Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Double256Mask laneIsValid() {
+ return (Double256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Double256Shuffle rearrange(VectorShuffle<Double> shuffle) {
+ Double256Shuffle concreteShuffle = (Double256Shuffle) shuffle;
+ return (Double256Shuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_256))
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Double256Shuffle wrapIndexes() {
+ Long256Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Long256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Long256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Double256Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Double256Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
index 6ed3dd7325c..64535c67b19 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
@@ -141,24 +141,15 @@ Double512Mask maskFromArray(boolean[] bits) {
@ForceInline
Double512Shuffle iotaShuffle() { return Double512Shuffle.IOTA; }
+ @Override
@ForceInline
Double512Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Double512Shuffle)VectorSupport.shuffleIota(ETYPE, Double512Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Double512Shuffle)VectorSupport.shuffleIota(ETYPE, Double512Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Double512Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Double512Shuffle shuffleFromBytes(byte[] reorder) { return new Double512Shuffle(reorder); }
-
- @Override
- @ForceInline
- Double512Shuffle shuffleFromArray(int[] indexes, int i) { return new Double512Shuffle(indexes, i); }
+ Double512Shuffle shuffleFromArray(int[] indices, int i) { return new Double512Shuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Double512Mask.class, (Double512Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Double> toShuffle() {
- return super.toShuffleTemplate(Double512Shuffle.class); // specialize
+ public final Double512Shuffle toShuffle() {
+ return (Double512Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -792,25 +790,28 @@ static Double512Mask maskAll(boolean bit) {
static final class Double512Shuffle extends AbstractShuffle<Double> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Double> ETYPE = double.class; // used by the JVM
+ static final Class<Long> ETYPE = long.class; // used by the JVM
- Double512Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Double512Shuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Double512Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Double512Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Double512Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Double512Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Double512Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public DoubleSpecies vspecies() {
return VSPECIES;
}
@@ -818,47 +819,122 @@ public DoubleSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final Double512Shuffle IOTA = new Double512Shuffle(IDENTITY);
@Override
@ForceInline
public Double512Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Double512Shuffle.class, this, VLENGTH,
- (s) -> ((Double512Vector)(((AbstractShuffle<Double>)(s)).toVectorTemplate())));
+ return (Double512Vector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Long512Vector toBitsVector() {
+ return (Long512Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Long512Vector toBitsVector0() {
+ return ((Long512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Double512Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Double512Shuffle.class, this, VLENGTH,
- (s) -> ((Double512Shuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
@Override
- public Double512Shuffle rearrange(VectorShuffle<Double> shuffle) {
- Double512Shuffle s = (Double512Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Double512Mask laneIsValid() {
+ return (Double512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Double512Shuffle rearrange(VectorShuffle<Double> shuffle) {
+ Double512Shuffle concreteShuffle = (Double512Shuffle) shuffle;
+ return (Double512Shuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_512))
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Double512Shuffle wrapIndexes() {
+ Long512Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Long512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Long512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Double512Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Double512Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
index 2e1b2135001..45b91ee88bf 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
@@ -141,24 +141,15 @@ Double64Mask maskFromArray(boolean[] bits) {
@ForceInline
Double64Shuffle iotaShuffle() { return Double64Shuffle.IOTA; }
+ @Override
@ForceInline
Double64Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Double64Shuffle)VectorSupport.shuffleIota(ETYPE, Double64Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Double64Shuffle)VectorSupport.shuffleIota(ETYPE, Double64Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Double64Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Double64Shuffle shuffleFromBytes(byte[] reorder) { return new Double64Shuffle(reorder); }
-
- @Override
- @ForceInline
- Double64Shuffle shuffleFromArray(int[] indexes, int i) { return new Double64Shuffle(indexes, i); }
+ Double64Shuffle shuffleFromArray(int[] indices, int i) { return new Double64Shuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Double64Mask.class, (Double64Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Double> toShuffle() {
- return super.toShuffleTemplate(Double64Shuffle.class); // specialize
+ public final Double64Shuffle toShuffle() {
+ return (Double64Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -778,25 +776,28 @@ static Double64Mask maskAll(boolean bit) {
static final class Double64Shuffle extends AbstractShuffle<Double> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Double> ETYPE = double.class; // used by the JVM
+ static final Class<Long> ETYPE = long.class; // used by the JVM
- Double64Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Double64Shuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Double64Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Double64Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Double64Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Double64Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Double64Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public DoubleSpecies vspecies() {
return VSPECIES;
}
@@ -804,47 +805,122 @@ public DoubleSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final Double64Shuffle IOTA = new Double64Shuffle(IDENTITY);
@Override
@ForceInline
public Double64Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Double64Shuffle.class, this, VLENGTH,
- (s) -> ((Double64Vector)(((AbstractShuffle<Double>)(s)).toVectorTemplate())));
+ return (Double64Vector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Long64Vector toBitsVector() {
+ return (Long64Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Long64Vector toBitsVector0() {
+ return ((Long64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Double64Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Double64Shuffle.class, this, VLENGTH,
- (s) -> ((Double64Shuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
@Override
- public Double64Shuffle rearrange(VectorShuffle<Double> shuffle) {
- Double64Shuffle s = (Double64Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Double64Mask laneIsValid() {
+ return (Double64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Double64Shuffle rearrange(VectorShuffle<Double> shuffle) {
+ Double64Shuffle concreteShuffle = (Double64Shuffle) shuffle;
+ return (Double64Shuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_64))
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Double64Shuffle wrapIndexes() {
+ Long64Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Long64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Long64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Double64Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Double64Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
index 8d69b6fcbc7..03f9448f1ab 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
@@ -141,24 +141,15 @@ DoubleMaxMask maskFromArray(boolean[] bits) {
@ForceInline
DoubleMaxShuffle iotaShuffle() { return DoubleMaxShuffle.IOTA; }
+ @Override
@ForceInline
DoubleMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (DoubleMaxShuffle)VectorSupport.shuffleIota(ETYPE, DoubleMaxShuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (DoubleMaxShuffle)VectorSupport.shuffleIota(ETYPE, DoubleMaxShuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (DoubleMaxShuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- DoubleMaxShuffle shuffleFromBytes(byte[] reorder) { return new DoubleMaxShuffle(reorder); }
-
- @Override
- @ForceInline
- DoubleMaxShuffle shuffleFromArray(int[] indexes, int i) { return new DoubleMaxShuffle(indexes, i); }
+ DoubleMaxShuffle shuffleFromArray(int[] indices, int i) { return new DoubleMaxShuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, DoubleMaxMask.class, (DoubleMaxMask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Double> toShuffle() {
- return super.toShuffleTemplate(DoubleMaxShuffle.class); // specialize
+ public final DoubleMaxShuffle toShuffle() {
+ return (DoubleMaxShuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -777,25 +775,28 @@ static DoubleMaxMask maskAll(boolean bit) {
static final class DoubleMaxShuffle extends AbstractShuffle<Double> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Double> ETYPE = double.class; // used by the JVM
+ static final Class<Long> ETYPE = long.class; // used by the JVM
- DoubleMaxShuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ DoubleMaxShuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public DoubleMaxShuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ DoubleMaxShuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public DoubleMaxShuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ DoubleMaxShuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public DoubleMaxShuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public DoubleSpecies vspecies() {
return VSPECIES;
}
@@ -803,47 +804,122 @@ public DoubleSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final DoubleMaxShuffle IOTA = new DoubleMaxShuffle(IDENTITY);
@Override
@ForceInline
public DoubleMaxVector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, DoubleMaxShuffle.class, this, VLENGTH,
- (s) -> ((DoubleMaxVector)(((AbstractShuffle<Double>)(s)).toVectorTemplate())));
+ return (DoubleMaxVector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ LongMaxVector toBitsVector() {
+ return (LongMaxVector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ LongMaxVector toBitsVector0() {
+ return ((LongMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public DoubleMaxShuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, DoubleMaxShuffle.class, this, VLENGTH,
- (s) -> ((DoubleMaxShuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
@Override
- public DoubleMaxShuffle rearrange(VectorShuffle<Double> shuffle) {
- DoubleMaxShuffle s = (DoubleMaxShuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final DoubleMaxMask laneIsValid() {
+ return (DoubleMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final DoubleMaxShuffle rearrange(VectorShuffle<Double> shuffle) {
+ DoubleMaxShuffle concreteShuffle = (DoubleMaxShuffle) shuffle;
+ return (DoubleMaxShuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_MAX))
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final DoubleMaxShuffle wrapIndexes() {
+ LongMaxVector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (LongMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (LongMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (DoubleMaxShuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new DoubleMaxShuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
index 5b3a25baa58..8065bf915a5 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
@@ -966,7 +966,7 @@ DoubleVector lanewise(VectorOperators.Binary op,
// and broadcast, but it would be more surprising not to continue
// the obvious pattern started by unary and binary.
- /**
+ /**
* {@inheritDoc} <!--workaround-->
* @see #lanewise(VectorOperators.Ternary,double,double,VectorMask)
* @see #lanewise(VectorOperators.Ternary,Vector,double,VectorMask)
@@ -2138,9 +2138,10 @@ DoubleVector sliceTemplate(int origin, Vector<Double> v1) {
DoubleVector that = (DoubleVector) v1;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Double> iota = iotaShuffle();
- VectorMask<Double> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((double)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ LongVector iotaVector = (LongVector) iotaShuffle().toBitsVector();
+ LongVector filter = LongVector.broadcast((LongVector.LongSpecies) vspecies().asIntegral(), (long)(length() - origin));
+ VectorMask<Double> blendMask = iotaVector.compare(VectorOperators.LT, filter).cast(vspecies());
+ AbstractShuffle<Double> iota = iotaShuffle(origin, 1, true);
return that.rearrange(iota).blend(this.rearrange(iota), blendMask);
}
@@ -2168,9 +2169,10 @@ DoubleVector slice(int origin,
@ForceInline
DoubleVector sliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Double> iota = iotaShuffle();
- VectorMask<Double> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((double)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ LongVector iotaVector = (LongVector) iotaShuffle().toBitsVector();
+ LongVector filter = LongVector.broadcast((LongVector.LongSpecies) vspecies().asIntegral(), (long)(length() - origin));
+ VectorMask<Double> blendMask = iotaVector.compare(VectorOperators.LT, filter).cast(vspecies());
+ AbstractShuffle<Double> iota = iotaShuffle(origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2189,10 +2191,10 @@ DoubleVector sliceTemplate(int origin) {
DoubleVector that = (DoubleVector) w;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Double> iota = iotaShuffle();
- VectorMask<Double> blendMask = iota.toVector().compare((part == 0) ? VectorOperators.GE : VectorOperators.LT,
- (broadcast((double)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ LongVector iotaVector = (LongVector) iotaShuffle().toBitsVector();
+ LongVector filter = LongVector.broadcast((LongVector.LongSpecies) vspecies().asIntegral(), (long)origin);
+ VectorMask<Double> blendMask = iotaVector.compare((part == 0) ? VectorOperators.GE : VectorOperators.LT, filter).cast(vspecies());
+ AbstractShuffle<Double> iota = iotaShuffle(-origin, 1, true);
return that.blend(this.rearrange(iota), blendMask);
}
@@ -2229,10 +2231,10 @@ DoubleVector sliceTemplate(int origin) {
DoubleVector
unsliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Double> iota = iotaShuffle();
- VectorMask<Double> blendMask = iota.toVector().compare(VectorOperators.GE,
- (broadcast((double)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ LongVector iotaVector = (LongVector) iotaShuffle().toBitsVector();
+ LongVector filter = LongVector.broadcast((LongVector.LongSpecies) vspecies().asIntegral(), (long)origin);
+ VectorMask<Double> blendMask = iotaVector.compare(VectorOperators.GE, filter).cast(vspecies());
+ AbstractShuffle<Double> iota = iotaShuffle(-origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2255,13 +2257,11 @@ DoubleVector sliceTemplate(int origin) {
final
<S extends VectorShuffle<Double>>
DoubleVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, null, double.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
}
@@ -2284,13 +2284,11 @@ DoubleVector rearrangeTemplate(Class<S> shuffletype,
M m) {
m.check(masktype, this);
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, masktype, double.class, length(),
- this, ws, m,
+ this, shuffle, m,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return !m_.laneIsSet(i) ? 0 : v1.lane(ei);
}));
}
@@ -2311,48 +2309,43 @@ DoubleVector rearrangeTemplate(Class<S> shuffletype,
S shuffle,
DoubleVector v) {
VectorMask<Double> valid = shuffle.laneIsValid();
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
DoubleVector r0 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, double.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v0, s_, m_) -> v0.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
return v0.lane(ei);
}));
DoubleVector r1 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, double.class, length(),
- v, ws, null,
+ v, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
return r1.blend(r0, valid);
}
+ @Override
@ForceInline
- private final
- VectorShuffle<Double> toShuffle0(DoubleSpecies dsp) {
- double[] a = toArray();
- int[] sa = new int[a.length];
- for (int i = 0; i < a.length; i++) {
- sa[i] = (int) a[i];
- }
- return VectorShuffle.fromArray(dsp, sa, 0);
+ final <F> VectorShuffle<F> bitsToShuffle0(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
}
- /*package-private*/
@ForceInline
- final
- VectorShuffle<Double> toShuffleTemplate(Class<?> shuffleType) {
- DoubleSpecies vsp = vspecies();
- return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
- getClass(), double.class, length(),
- shuffleType, byte.class, length(),
- this, vsp,
- DoubleVector::toShuffle0);
+ final <F>
+ VectorShuffle<F> toShuffle(AbstractSpecies<F> dsp, boolean wrap) {
+ assert(dsp.elementSize() == vspecies().elementSize());
+ LongVector idx = convert(VectorOperators.D2L, 0).reinterpretAsLongs();
+ LongVector wrapped = idx.lanewise(VectorOperators.AND, length() - 1);
+ if (!wrap) {
+ LongVector wrappedEx = wrapped.lanewise(VectorOperators.SUB, length());
+ VectorMask<Long> inBound = wrapped.compare(VectorOperators.EQ, idx);
+ wrapped = wrappedEx.blend(wrapped, inBound);
+ }
+ return wrapped.bitsToShuffle(dsp);
}
/**
@@ -3731,9 +3724,10 @@ static final class DoubleSpecies extends AbstractSpecies<Double> {
private DoubleSpecies(VectorShape shape,
Class<? extends DoubleVector> vectorType,
Class<? extends AbstractMask<Double>> maskType,
+ Class<? extends AbstractShuffle<Double>> shuffleType,
Function<Object, DoubleVector> vectorFactory) {
super(shape, LaneType.of(double.class),
- vectorType, maskType,
+ vectorType, maskType, shuffleType,
vectorFactory);
assert(this.elementSize() == Double.SIZE);
}
@@ -4019,6 +4013,7 @@ static DoubleSpecies species(VectorShape s) {
= new DoubleSpecies(VectorShape.S_64_BIT,
Double64Vector.class,
Double64Vector.Double64Mask.class,
+ Double64Vector.Double64Shuffle.class,
Double64Vector::new);
/** Species representing {@link DoubleVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
@@ -4026,6 +4021,7 @@ static DoubleSpecies species(VectorShape s) {
= new DoubleSpecies(VectorShape.S_128_BIT,
Double128Vector.class,
Double128Vector.Double128Mask.class,
+ Double128Vector.Double128Shuffle.class,
Double128Vector::new);
/** Species representing {@link DoubleVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
@@ -4033,6 +4029,7 @@ static DoubleSpecies species(VectorShape s) {
= new DoubleSpecies(VectorShape.S_256_BIT,
Double256Vector.class,
Double256Vector.Double256Mask.class,
+ Double256Vector.Double256Shuffle.class,
Double256Vector::new);
/** Species representing {@link DoubleVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
@@ -4040,6 +4037,7 @@ static DoubleSpecies species(VectorShape s) {
= new DoubleSpecies(VectorShape.S_512_BIT,
Double512Vector.class,
Double512Vector.Double512Mask.class,
+ Double512Vector.Double512Shuffle.class,
Double512Vector::new);
/** Species representing {@link DoubleVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
@@ -4047,6 +4045,7 @@ static DoubleSpecies species(VectorShape s) {
= new DoubleSpecies(VectorShape.S_Max_BIT,
DoubleMaxVector.class,
DoubleMaxVector.DoubleMaxMask.class,
+ DoubleMaxVector.DoubleMaxShuffle.class,
DoubleMaxVector::new);
/**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
index 79239532cc6..77301e4c773 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
@@ -141,24 +141,15 @@ Float128Mask maskFromArray(boolean[] bits) {
@ForceInline
Float128Shuffle iotaShuffle() { return Float128Shuffle.IOTA; }
+ @Override
@ForceInline
Float128Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Float128Shuffle)VectorSupport.shuffleIota(ETYPE, Float128Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Float128Shuffle)VectorSupport.shuffleIota(ETYPE, Float128Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Float128Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Float128Shuffle shuffleFromBytes(byte[] reorder) { return new Float128Shuffle(reorder); }
-
- @Override
- @ForceInline
- Float128Shuffle shuffleFromArray(int[] indexes, int i) { return new Float128Shuffle(indexes, i); }
+ Float128Shuffle shuffleFromArray(int[] indices, int i) { return new Float128Shuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Float128Mask.class, (Float128Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Float> toShuffle() {
- return super.toShuffleTemplate(Float128Shuffle.class); // specialize
+ public final Float128Shuffle toShuffle() {
+ return (Float128Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -784,25 +782,28 @@ static Float128Mask maskAll(boolean bit) {
static final class Float128Shuffle extends AbstractShuffle<Float> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Float> ETYPE = float.class; // used by the JVM
+ static final Class<Integer> ETYPE = int.class; // used by the JVM
- Float128Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Float128Shuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Float128Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Float128Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Float128Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Float128Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Float128Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public FloatSpecies vspecies() {
return VSPECIES;
}
@@ -810,47 +811,98 @@ public FloatSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final Float128Shuffle IOTA = new Float128Shuffle(IDENTITY);
@Override
@ForceInline
public Float128Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Float128Shuffle.class, this, VLENGTH,
- (s) -> ((Float128Vector)(((AbstractShuffle<Float>)(s)).toVectorTemplate())));
+ return (Float128Vector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Int128Vector toBitsVector() {
+ return (Int128Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Int128Vector toBitsVector0() {
+ return ((Int128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
+ }
+
+ @Override
+ @ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
}
@Override
@ForceInline
- public Float128Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Float128Shuffle.class, this, VLENGTH,
- (s) -> ((Float128Shuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
+ public final Float128Mask laneIsValid() {
+ return (Float128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Float128Shuffle rearrange(VectorShuffle<Float> shuffle) {
+ Float128Shuffle concreteShuffle = (Float128Shuffle) shuffle;
+ return (Float128Shuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_128))
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public Float128Shuffle rearrange(VectorShuffle<Float> shuffle) {
- Float128Shuffle s = (Float128Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final Float128Shuffle wrapIndexes() {
+ Int128Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Int128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Int128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Float128Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Float128Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
index 5f5a26fd316..f81a9adda42 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
@@ -141,24 +141,15 @@ Float256Mask maskFromArray(boolean[] bits) {
@ForceInline
Float256Shuffle iotaShuffle() { return Float256Shuffle.IOTA; }
+ @Override
@ForceInline
Float256Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Float256Shuffle)VectorSupport.shuffleIota(ETYPE, Float256Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Float256Shuffle)VectorSupport.shuffleIota(ETYPE, Float256Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Float256Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Float256Shuffle shuffleFromBytes(byte[] reorder) { return new Float256Shuffle(reorder); }
-
- @Override
- @ForceInline
- Float256Shuffle shuffleFromArray(int[] indexes, int i) { return new Float256Shuffle(indexes, i); }
+ Float256Shuffle shuffleFromArray(int[] indices, int i) { return new Float256Shuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Float256Mask.class, (Float256Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Float> toShuffle() {
- return super.toShuffleTemplate(Float256Shuffle.class); // specialize
+ public final Float256Shuffle toShuffle() {
+ return (Float256Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -792,25 +790,28 @@ static Float256Mask maskAll(boolean bit) {
static final class Float256Shuffle extends AbstractShuffle<Float> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Float> ETYPE = float.class; // used by the JVM
+ static final Class<Integer> ETYPE = int.class; // used by the JVM
- Float256Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Float256Shuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Float256Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Float256Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Float256Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Float256Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Float256Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public FloatSpecies vspecies() {
return VSPECIES;
}
@@ -818,47 +819,98 @@ public FloatSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final Float256Shuffle IOTA = new Float256Shuffle(IDENTITY);
@Override
@ForceInline
public Float256Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Float256Shuffle.class, this, VLENGTH,
- (s) -> ((Float256Vector)(((AbstractShuffle<Float>)(s)).toVectorTemplate())));
+ return (Float256Vector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Int256Vector toBitsVector() {
+ return (Int256Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Int256Vector toBitsVector0() {
+ return ((Int256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
+ }
+
+ @Override
+ @ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
}
@Override
@ForceInline
- public Float256Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Float256Shuffle.class, this, VLENGTH,
- (s) -> ((Float256Shuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
+ public final Float256Mask laneIsValid() {
+ return (Float256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Float256Shuffle rearrange(VectorShuffle<Float> shuffle) {
+ Float256Shuffle concreteShuffle = (Float256Shuffle) shuffle;
+ return (Float256Shuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_256))
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public Float256Shuffle rearrange(VectorShuffle<Float> shuffle) {
- Float256Shuffle s = (Float256Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final Float256Shuffle wrapIndexes() {
+ Int256Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Int256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Int256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Float256Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Float256Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
index f8c191ea016..1cf6afca4b4 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
@@ -141,24 +141,15 @@ Float512Mask maskFromArray(boolean[] bits) {
@ForceInline
Float512Shuffle iotaShuffle() { return Float512Shuffle.IOTA; }
+ @Override
@ForceInline
Float512Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Float512Shuffle)VectorSupport.shuffleIota(ETYPE, Float512Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Float512Shuffle)VectorSupport.shuffleIota(ETYPE, Float512Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Float512Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Float512Shuffle shuffleFromBytes(byte[] reorder) { return new Float512Shuffle(reorder); }
-
- @Override
- @ForceInline
- Float512Shuffle shuffleFromArray(int[] indexes, int i) { return new Float512Shuffle(indexes, i); }
+ Float512Shuffle shuffleFromArray(int[] indices, int i) { return new Float512Shuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Float512Mask.class, (Float512Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Float> toShuffle() {
- return super.toShuffleTemplate(Float512Shuffle.class); // specialize
+ public final Float512Shuffle toShuffle() {
+ return (Float512Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -808,25 +806,28 @@ static Float512Mask maskAll(boolean bit) {
static final class Float512Shuffle extends AbstractShuffle<Float> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Float> ETYPE = float.class; // used by the JVM
+ static final Class<Integer> ETYPE = int.class; // used by the JVM
- Float512Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Float512Shuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Float512Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Float512Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Float512Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Float512Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Float512Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public FloatSpecies vspecies() {
return VSPECIES;
}
@@ -834,47 +835,98 @@ public FloatSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final Float512Shuffle IOTA = new Float512Shuffle(IDENTITY);
@Override
@ForceInline
public Float512Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Float512Shuffle.class, this, VLENGTH,
- (s) -> ((Float512Vector)(((AbstractShuffle<Float>)(s)).toVectorTemplate())));
+ return (Float512Vector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Int512Vector toBitsVector() {
+ return (Int512Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Int512Vector toBitsVector0() {
+ return ((Int512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
+ }
+
+ @Override
+ @ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
}
@Override
@ForceInline
- public Float512Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Float512Shuffle.class, this, VLENGTH,
- (s) -> ((Float512Shuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
+ public final Float512Mask laneIsValid() {
+ return (Float512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Float512Shuffle rearrange(VectorShuffle<Float> shuffle) {
+ Float512Shuffle concreteShuffle = (Float512Shuffle) shuffle;
+ return (Float512Shuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_512))
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public Float512Shuffle rearrange(VectorShuffle<Float> shuffle) {
- Float512Shuffle s = (Float512Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final Float512Shuffle wrapIndexes() {
+ Int512Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Int512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Int512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Float512Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Float512Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
index 9496e598868..1974b93d0ae 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
@@ -141,24 +141,15 @@ Float64Mask maskFromArray(boolean[] bits) {
@ForceInline
Float64Shuffle iotaShuffle() { return Float64Shuffle.IOTA; }
+ @Override
@ForceInline
Float64Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Float64Shuffle)VectorSupport.shuffleIota(ETYPE, Float64Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Float64Shuffle)VectorSupport.shuffleIota(ETYPE, Float64Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Float64Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Float64Shuffle shuffleFromBytes(byte[] reorder) { return new Float64Shuffle(reorder); }
-
- @Override
- @ForceInline
- Float64Shuffle shuffleFromArray(int[] indexes, int i) { return new Float64Shuffle(indexes, i); }
+ Float64Shuffle shuffleFromArray(int[] indices, int i) { return new Float64Shuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Float64Mask.class, (Float64Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Float> toShuffle() {
- return super.toShuffleTemplate(Float64Shuffle.class); // specialize
+ public final Float64Shuffle toShuffle() {
+ return (Float64Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -780,25 +778,28 @@ static Float64Mask maskAll(boolean bit) {
static final class Float64Shuffle extends AbstractShuffle<Float> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Float> ETYPE = float.class; // used by the JVM
+ static final Class<Integer> ETYPE = int.class; // used by the JVM
- Float64Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Float64Shuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Float64Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Float64Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Float64Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Float64Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Float64Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public FloatSpecies vspecies() {
return VSPECIES;
}
@@ -806,47 +807,98 @@ public FloatSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final Float64Shuffle IOTA = new Float64Shuffle(IDENTITY);
@Override
@ForceInline
public Float64Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Float64Shuffle.class, this, VLENGTH,
- (s) -> ((Float64Vector)(((AbstractShuffle<Float>)(s)).toVectorTemplate())));
+ return (Float64Vector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Int64Vector toBitsVector() {
+ return (Int64Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Int64Vector toBitsVector0() {
+ return ((Int64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
+ }
+
+ @Override
+ @ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
}
@Override
@ForceInline
- public Float64Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Float64Shuffle.class, this, VLENGTH,
- (s) -> ((Float64Shuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
+ public final Float64Mask laneIsValid() {
+ return (Float64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Float64Shuffle rearrange(VectorShuffle<Float> shuffle) {
+ Float64Shuffle concreteShuffle = (Float64Shuffle) shuffle;
+ return (Float64Shuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_64))
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public Float64Shuffle rearrange(VectorShuffle<Float> shuffle) {
- Float64Shuffle s = (Float64Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final Float64Shuffle wrapIndexes() {
+ Int64Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Int64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Int64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Float64Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Float64Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
index 6f093957262..14981d02151 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
@@ -141,24 +141,15 @@ FloatMaxMask maskFromArray(boolean[] bits) {
@ForceInline
FloatMaxShuffle iotaShuffle() { return FloatMaxShuffle.IOTA; }
+ @Override
@ForceInline
FloatMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (FloatMaxShuffle)VectorSupport.shuffleIota(ETYPE, FloatMaxShuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (FloatMaxShuffle)VectorSupport.shuffleIota(ETYPE, FloatMaxShuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (FloatMaxShuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- FloatMaxShuffle shuffleFromBytes(byte[] reorder) { return new FloatMaxShuffle(reorder); }
-
- @Override
- @ForceInline
- FloatMaxShuffle shuffleFromArray(int[] indexes, int i) { return new FloatMaxShuffle(indexes, i); }
+ FloatMaxShuffle shuffleFromArray(int[] indices, int i) { return new FloatMaxShuffle(indices, i); }
@Override
@ForceInline
@@ -344,9 +335,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, FloatMaxMask.class, (FloatMaxMask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Float> toShuffle() {
- return super.toShuffleTemplate(FloatMaxShuffle.class); // specialize
+ public final FloatMaxShuffle toShuffle() {
+ return (FloatMaxShuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -777,25 +775,28 @@ static FloatMaxMask maskAll(boolean bit) {
static final class FloatMaxShuffle extends AbstractShuffle<Float> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<Float> ETYPE = float.class; // used by the JVM
+ static final Class<Integer> ETYPE = int.class; // used by the JVM
- FloatMaxShuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ FloatMaxShuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public FloatMaxShuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ FloatMaxShuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public FloatMaxShuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ FloatMaxShuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public FloatMaxShuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public FloatSpecies vspecies() {
return VSPECIES;
}
@@ -803,47 +804,98 @@ public FloatSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final FloatMaxShuffle IOTA = new FloatMaxShuffle(IDENTITY);
@Override
@ForceInline
public FloatMaxVector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, FloatMaxShuffle.class, this, VLENGTH,
- (s) -> ((FloatMaxVector)(((AbstractShuffle<Float>)(s)).toVectorTemplate())));
+ return (FloatMaxVector) toBitsVector().castShape(vspecies(), 0);
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ IntMaxVector toBitsVector() {
+ return (IntMaxVector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ IntMaxVector toBitsVector0() {
+ return ((IntMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
+ }
+
+ @Override
+ @ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
}
@Override
@ForceInline
- public FloatMaxShuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, FloatMaxShuffle.class, this, VLENGTH,
- (s) -> ((FloatMaxShuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
+ public final FloatMaxMask laneIsValid() {
+ return (FloatMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final FloatMaxShuffle rearrange(VectorShuffle<Float> shuffle) {
+ FloatMaxShuffle concreteShuffle = (FloatMaxShuffle) shuffle;
+ return (FloatMaxShuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_MAX))
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public FloatMaxShuffle rearrange(VectorShuffle<Float> shuffle) {
- FloatMaxShuffle s = (FloatMaxShuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final FloatMaxShuffle wrapIndexes() {
+ IntMaxVector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (IntMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (IntMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (FloatMaxShuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new FloatMaxShuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
index a3686d467a7..ab056d1c397 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
@@ -966,7 +966,7 @@ FloatVector lanewise(VectorOperators.Binary op,
// and broadcast, but it would be more surprising not to continue
// the obvious pattern started by unary and binary.
- /**
+ /**
* {@inheritDoc} <!--workaround-->
* @see #lanewise(VectorOperators.Ternary,float,float,VectorMask)
* @see #lanewise(VectorOperators.Ternary,Vector,float,VectorMask)
@@ -2150,9 +2150,10 @@ FloatVector sliceTemplate(int origin, Vector<Float> v1) {
FloatVector that = (FloatVector) v1;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Float> iota = iotaShuffle();
- VectorMask<Float> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((float)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ IntVector iotaVector = (IntVector) iotaShuffle().toBitsVector();
+ IntVector filter = IntVector.broadcast((IntVector.IntSpecies) vspecies().asIntegral(), (int)(length() - origin));
+ VectorMask<Float> blendMask = iotaVector.compare(VectorOperators.LT, filter).cast(vspecies());
+ AbstractShuffle<Float> iota = iotaShuffle(origin, 1, true);
return that.rearrange(iota).blend(this.rearrange(iota), blendMask);
}
@@ -2180,9 +2181,10 @@ FloatVector slice(int origin,
@ForceInline
FloatVector sliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Float> iota = iotaShuffle();
- VectorMask<Float> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((float)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ IntVector iotaVector = (IntVector) iotaShuffle().toBitsVector();
+ IntVector filter = IntVector.broadcast((IntVector.IntSpecies) vspecies().asIntegral(), (int)(length() - origin));
+ VectorMask<Float> blendMask = iotaVector.compare(VectorOperators.LT, filter).cast(vspecies());
+ AbstractShuffle<Float> iota = iotaShuffle(origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2201,10 +2203,10 @@ FloatVector sliceTemplate(int origin) {
FloatVector that = (FloatVector) w;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Float> iota = iotaShuffle();
- VectorMask<Float> blendMask = iota.toVector().compare((part == 0) ? VectorOperators.GE : VectorOperators.LT,
- (broadcast((float)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ IntVector iotaVector = (IntVector) iotaShuffle().toBitsVector();
+ IntVector filter = IntVector.broadcast((IntVector.IntSpecies) vspecies().asIntegral(), (int)origin);
+ VectorMask<Float> blendMask = iotaVector.compare((part == 0) ? VectorOperators.GE : VectorOperators.LT, filter).cast(vspecies());
+ AbstractShuffle<Float> iota = iotaShuffle(-origin, 1, true);
return that.blend(this.rearrange(iota), blendMask);
}
@@ -2241,10 +2243,10 @@ FloatVector sliceTemplate(int origin) {
FloatVector
unsliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Float> iota = iotaShuffle();
- VectorMask<Float> blendMask = iota.toVector().compare(VectorOperators.GE,
- (broadcast((float)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ IntVector iotaVector = (IntVector) iotaShuffle().toBitsVector();
+ IntVector filter = IntVector.broadcast((IntVector.IntSpecies) vspecies().asIntegral(), (int)origin);
+ VectorMask<Float> blendMask = iotaVector.compare(VectorOperators.GE, filter).cast(vspecies());
+ AbstractShuffle<Float> iota = iotaShuffle(-origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2267,13 +2269,11 @@ FloatVector sliceTemplate(int origin) {
final
<S extends VectorShuffle<Float>>
FloatVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, null, float.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
}
@@ -2296,13 +2296,11 @@ FloatVector rearrangeTemplate(Class<S> shuffletype,
M m) {
m.check(masktype, this);
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, masktype, float.class, length(),
- this, ws, m,
+ this, shuffle, m,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return !m_.laneIsSet(i) ? 0 : v1.lane(ei);
}));
}
@@ -2323,48 +2321,43 @@ FloatVector rearrangeTemplate(Class<S> shuffletype,
S shuffle,
FloatVector v) {
VectorMask<Float> valid = shuffle.laneIsValid();
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
FloatVector r0 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, float.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v0, s_, m_) -> v0.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
return v0.lane(ei);
}));
FloatVector r1 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, float.class, length(),
- v, ws, null,
+ v, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
return r1.blend(r0, valid);
}
+ @Override
@ForceInline
- private final
- VectorShuffle<Float> toShuffle0(FloatSpecies dsp) {
- float[] a = toArray();
- int[] sa = new int[a.length];
- for (int i = 0; i < a.length; i++) {
- sa[i] = (int) a[i];
- }
- return VectorShuffle.fromArray(dsp, sa, 0);
+ final <F> VectorShuffle<F> bitsToShuffle0(AbstractSpecies<F> dsp) {
+ throw new AssertionError();
}
- /*package-private*/
@ForceInline
- final
- VectorShuffle<Float> toShuffleTemplate(Class<?> shuffleType) {
- FloatSpecies vsp = vspecies();
- return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
- getClass(), float.class, length(),
- shuffleType, byte.class, length(),
- this, vsp,
- FloatVector::toShuffle0);
+ final <F>
+ VectorShuffle<F> toShuffle(AbstractSpecies<F> dsp, boolean wrap) {
+ assert(dsp.elementSize() == vspecies().elementSize());
+ IntVector idx = convert(VectorOperators.F2I, 0).reinterpretAsInts();
+ IntVector wrapped = idx.lanewise(VectorOperators.AND, length() - 1);
+ if (!wrap) {
+ IntVector wrappedEx = wrapped.lanewise(VectorOperators.SUB, length());
+ VectorMask<Integer> inBound = wrapped.compare(VectorOperators.EQ, idx);
+ wrapped = wrappedEx.blend(wrapped, inBound);
+ }
+ return wrapped.bitsToShuffle(dsp);
}
/**
@@ -3681,9 +3674,10 @@ static final class FloatSpecies extends AbstractSpecies<Float> {
private FloatSpecies(VectorShape shape,
Class<? extends FloatVector> vectorType,
Class<? extends AbstractMask<Float>> maskType,
+ Class<? extends AbstractShuffle<Float>> shuffleType,
Function<Object, FloatVector> vectorFactory) {
super(shape, LaneType.of(float.class),
- vectorType, maskType,
+ vectorType, maskType, shuffleType,
vectorFactory);
assert(this.elementSize() == Float.SIZE);
}
@@ -3969,6 +3963,7 @@ static FloatSpecies species(VectorShape s) {
= new FloatSpecies(VectorShape.S_64_BIT,
Float64Vector.class,
Float64Vector.Float64Mask.class,
+ Float64Vector.Float64Shuffle.class,
Float64Vector::new);
/** Species representing {@link FloatVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
@@ -3976,6 +3971,7 @@ static FloatSpecies species(VectorShape s) {
= new FloatSpecies(VectorShape.S_128_BIT,
Float128Vector.class,
Float128Vector.Float128Mask.class,
+ Float128Vector.Float128Shuffle.class,
Float128Vector::new);
/** Species representing {@link FloatVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
@@ -3983,6 +3979,7 @@ static FloatSpecies species(VectorShape s) {
= new FloatSpecies(VectorShape.S_256_BIT,
Float256Vector.class,
Float256Vector.Float256Mask.class,
+ Float256Vector.Float256Shuffle.class,
Float256Vector::new);
/** Species representing {@link FloatVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
@@ -3990,6 +3987,7 @@ static FloatSpecies species(VectorShape s) {
= new FloatSpecies(VectorShape.S_512_BIT,
Float512Vector.class,
Float512Vector.Float512Mask.class,
+ Float512Vector.Float512Shuffle.class,
Float512Vector::new);
/** Species representing {@link FloatVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
@@ -3997,6 +3995,7 @@ static FloatSpecies species(VectorShape s) {
= new FloatSpecies(VectorShape.S_Max_BIT,
FloatMaxVector.class,
FloatMaxVector.FloatMaxMask.class,
+ FloatMaxVector.FloatMaxShuffle.class,
FloatMaxVector::new);
/**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
index 4aa1e8044b0..a4660dd94c6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
@@ -141,24 +141,15 @@ Int128Mask maskFromArray(boolean[] bits) {
@ForceInline
Int128Shuffle iotaShuffle() { return Int128Shuffle.IOTA; }
+ @Override
@ForceInline
Int128Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Int128Shuffle)VectorSupport.shuffleIota(ETYPE, Int128Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Int128Shuffle)VectorSupport.shuffleIota(ETYPE, Int128Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Int128Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Int128Shuffle shuffleFromBytes(byte[] reorder) { return new Int128Shuffle(reorder); }
-
- @Override
- @ForceInline
- Int128Shuffle shuffleFromArray(int[] indexes, int i) { return new Int128Shuffle(indexes, i); }
+ Int128Shuffle shuffleFromArray(int[] indices, int i) { return new Int128Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Int128Mask.class, (Int128Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Integer> toShuffle() {
- return super.toShuffleTemplate(Int128Shuffle.class); // specialize
+ public final Int128Shuffle toShuffle() {
+ return (Int128Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -797,23 +795,26 @@ static final class Int128Shuffle extends AbstractShuffle<Integer> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Integer> ETYPE = int.class; // used by the JVM
- Int128Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Int128Shuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Int128Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Int128Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Int128Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Int128Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Int128Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public IntSpecies vspecies() {
return VSPECIES;
}
@@ -821,47 +822,98 @@ public IntSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final Int128Shuffle IOTA = new Int128Shuffle(IDENTITY);
@Override
@ForceInline
public Int128Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Int128Shuffle.class, this, VLENGTH,
- (s) -> ((Int128Vector)(((AbstractShuffle<Integer>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Int128Vector toBitsVector() {
+ return (Int128Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Int128Vector toBitsVector0() {
+ return ((Int128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Int128Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Int128Shuffle.class, this, VLENGTH,
- (s) -> ((Int128Shuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
+ }
+
@Override
- public Int128Shuffle rearrange(VectorShuffle<Integer> shuffle) {
- Int128Shuffle s = (Int128Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Int128Mask laneIsValid() {
+ return (Int128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Int128Shuffle rearrange(VectorShuffle<Integer> shuffle) {
+ Int128Shuffle concreteShuffle = (Int128Shuffle) shuffle;
+ return (Int128Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Int128Shuffle wrapIndexes() {
+ Int128Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Int128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Int128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Int128Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Int128Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
index 753f96f216f..284ee1cebca 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
@@ -141,24 +141,15 @@ Int256Mask maskFromArray(boolean[] bits) {
@ForceInline
Int256Shuffle iotaShuffle() { return Int256Shuffle.IOTA; }
+ @Override
@ForceInline
Int256Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Int256Shuffle)VectorSupport.shuffleIota(ETYPE, Int256Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Int256Shuffle)VectorSupport.shuffleIota(ETYPE, Int256Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Int256Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Int256Shuffle shuffleFromBytes(byte[] reorder) { return new Int256Shuffle(reorder); }
-
- @Override
- @ForceInline
- Int256Shuffle shuffleFromArray(int[] indexes, int i) { return new Int256Shuffle(indexes, i); }
+ Int256Shuffle shuffleFromArray(int[] indices, int i) { return new Int256Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Int256Mask.class, (Int256Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Integer> toShuffle() {
- return super.toShuffleTemplate(Int256Shuffle.class); // specialize
+ public final Int256Shuffle toShuffle() {
+ return (Int256Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -805,23 +803,26 @@ static final class Int256Shuffle extends AbstractShuffle<Integer> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Integer> ETYPE = int.class; // used by the JVM
- Int256Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Int256Shuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Int256Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Int256Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Int256Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Int256Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Int256Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public IntSpecies vspecies() {
return VSPECIES;
}
@@ -829,47 +830,98 @@ public IntSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final Int256Shuffle IOTA = new Int256Shuffle(IDENTITY);
@Override
@ForceInline
public Int256Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Int256Shuffle.class, this, VLENGTH,
- (s) -> ((Int256Vector)(((AbstractShuffle<Integer>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Int256Vector toBitsVector() {
+ return (Int256Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Int256Vector toBitsVector0() {
+ return ((Int256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Int256Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Int256Shuffle.class, this, VLENGTH,
- (s) -> ((Int256Shuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
+ }
+
@Override
- public Int256Shuffle rearrange(VectorShuffle<Integer> shuffle) {
- Int256Shuffle s = (Int256Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Int256Mask laneIsValid() {
+ return (Int256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Int256Shuffle rearrange(VectorShuffle<Integer> shuffle) {
+ Int256Shuffle concreteShuffle = (Int256Shuffle) shuffle;
+ return (Int256Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Int256Shuffle wrapIndexes() {
+ Int256Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Int256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Int256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Int256Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Int256Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
index 8e6ed6fc882..f0c8ddabfae 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
@@ -141,24 +141,15 @@ Int512Mask maskFromArray(boolean[] bits) {
@ForceInline
Int512Shuffle iotaShuffle() { return Int512Shuffle.IOTA; }
+ @Override
@ForceInline
Int512Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Int512Shuffle)VectorSupport.shuffleIota(ETYPE, Int512Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Int512Shuffle)VectorSupport.shuffleIota(ETYPE, Int512Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Int512Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Int512Shuffle shuffleFromBytes(byte[] reorder) { return new Int512Shuffle(reorder); }
-
- @Override
- @ForceInline
- Int512Shuffle shuffleFromArray(int[] indexes, int i) { return new Int512Shuffle(indexes, i); }
+ Int512Shuffle shuffleFromArray(int[] indices, int i) { return new Int512Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Int512Mask.class, (Int512Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Integer> toShuffle() {
- return super.toShuffleTemplate(Int512Shuffle.class); // specialize
+ public final Int512Shuffle toShuffle() {
+ return (Int512Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -821,23 +819,26 @@ static final class Int512Shuffle extends AbstractShuffle<Integer> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Integer> ETYPE = int.class; // used by the JVM
- Int512Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Int512Shuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Int512Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Int512Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Int512Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Int512Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Int512Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public IntSpecies vspecies() {
return VSPECIES;
}
@@ -845,47 +846,98 @@ public IntSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final Int512Shuffle IOTA = new Int512Shuffle(IDENTITY);
@Override
@ForceInline
public Int512Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Int512Shuffle.class, this, VLENGTH,
- (s) -> ((Int512Vector)(((AbstractShuffle<Integer>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Int512Vector toBitsVector() {
+ return (Int512Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Int512Vector toBitsVector0() {
+ return ((Int512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Int512Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Int512Shuffle.class, this, VLENGTH,
- (s) -> ((Int512Shuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
+ }
+
@Override
- public Int512Shuffle rearrange(VectorShuffle<Integer> shuffle) {
- Int512Shuffle s = (Int512Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Int512Mask laneIsValid() {
+ return (Int512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Int512Shuffle rearrange(VectorShuffle<Integer> shuffle) {
+ Int512Shuffle concreteShuffle = (Int512Shuffle) shuffle;
+ return (Int512Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Int512Shuffle wrapIndexes() {
+ Int512Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Int512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Int512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Int512Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Int512Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
index 98cd39d9beb..27963859a09 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
@@ -141,24 +141,15 @@ Int64Mask maskFromArray(boolean[] bits) {
@ForceInline
Int64Shuffle iotaShuffle() { return Int64Shuffle.IOTA; }
+ @Override
@ForceInline
Int64Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Int64Shuffle)VectorSupport.shuffleIota(ETYPE, Int64Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Int64Shuffle)VectorSupport.shuffleIota(ETYPE, Int64Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Int64Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Int64Shuffle shuffleFromBytes(byte[] reorder) { return new Int64Shuffle(reorder); }
-
- @Override
- @ForceInline
- Int64Shuffle shuffleFromArray(int[] indexes, int i) { return new Int64Shuffle(indexes, i); }
+ Int64Shuffle shuffleFromArray(int[] indices, int i) { return new Int64Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Int64Mask.class, (Int64Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Integer> toShuffle() {
- return super.toShuffleTemplate(Int64Shuffle.class); // specialize
+ public final Int64Shuffle toShuffle() {
+ return (Int64Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -793,23 +791,26 @@ static final class Int64Shuffle extends AbstractShuffle<Integer> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Integer> ETYPE = int.class; // used by the JVM
- Int64Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Int64Shuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Int64Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Int64Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Int64Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Int64Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Int64Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public IntSpecies vspecies() {
return VSPECIES;
}
@@ -817,47 +818,98 @@ public IntSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final Int64Shuffle IOTA = new Int64Shuffle(IDENTITY);
@Override
@ForceInline
public Int64Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Int64Shuffle.class, this, VLENGTH,
- (s) -> ((Int64Vector)(((AbstractShuffle<Integer>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Int64Vector toBitsVector() {
+ return (Int64Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Int64Vector toBitsVector0() {
+ return ((Int64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Int64Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Int64Shuffle.class, this, VLENGTH,
- (s) -> ((Int64Shuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
+ }
+
@Override
- public Int64Shuffle rearrange(VectorShuffle<Integer> shuffle) {
- Int64Shuffle s = (Int64Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Int64Mask laneIsValid() {
+ return (Int64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Int64Shuffle rearrange(VectorShuffle<Integer> shuffle) {
+ Int64Shuffle concreteShuffle = (Int64Shuffle) shuffle;
+ return (Int64Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Int64Shuffle wrapIndexes() {
+ Int64Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Int64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Int64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Int64Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Int64Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
index f301161b980..d5140567ca0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
@@ -141,24 +141,15 @@ IntMaxMask maskFromArray(boolean[] bits) {
@ForceInline
IntMaxShuffle iotaShuffle() { return IntMaxShuffle.IOTA; }
+ @Override
@ForceInline
IntMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (IntMaxShuffle)VectorSupport.shuffleIota(ETYPE, IntMaxShuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (IntMaxShuffle)VectorSupport.shuffleIota(ETYPE, IntMaxShuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (IntMaxShuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- IntMaxShuffle shuffleFromBytes(byte[] reorder) { return new IntMaxShuffle(reorder); }
-
- @Override
- @ForceInline
- IntMaxShuffle shuffleFromArray(int[] indexes, int i) { return new IntMaxShuffle(indexes, i); }
+ IntMaxShuffle shuffleFromArray(int[] indices, int i) { return new IntMaxShuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, IntMaxMask.class, (IntMaxMask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Integer> toShuffle() {
- return super.toShuffleTemplate(IntMaxShuffle.class); // specialize
+ public final IntMaxShuffle toShuffle() {
+ return (IntMaxShuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -802,23 +800,26 @@ static final class IntMaxShuffle extends AbstractShuffle<Integer> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Integer> ETYPE = int.class; // used by the JVM
- IntMaxShuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ IntMaxShuffle(int[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public IntMaxShuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ IntMaxShuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public IntMaxShuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ IntMaxShuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public IntMaxShuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ int[] indices() {
+ return (int[])getPayload();
}
@Override
+ @ForceInline
public IntSpecies vspecies() {
return VSPECIES;
}
@@ -826,47 +827,98 @@ public IntSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Integer.MAX_VALUE);
+ assert(Integer.MIN_VALUE <= -VLENGTH);
}
static final IntMaxShuffle IOTA = new IntMaxShuffle(IDENTITY);
@Override
@ForceInline
public IntMaxVector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, IntMaxShuffle.class, this, VLENGTH,
- (s) -> ((IntMaxVector)(((AbstractShuffle<Integer>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ IntMaxVector toBitsVector() {
+ return (IntMaxVector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ IntMaxVector toBitsVector0() {
+ return ((IntMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public IntMaxShuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, IntMaxShuffle.class, this, VLENGTH,
- (s) -> ((IntMaxShuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ toBitsVector().intoArray(a, offset);
+ }
+
@Override
- public IntMaxShuffle rearrange(VectorShuffle<Integer> shuffle) {
- IntMaxShuffle s = (IntMaxShuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final IntMaxMask laneIsValid() {
+ return (IntMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final IntMaxShuffle rearrange(VectorShuffle<Integer> shuffle) {
+ IntMaxShuffle concreteShuffle = (IntMaxShuffle) shuffle;
+ return (IntMaxShuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final IntMaxShuffle wrapIndexes() {
+ IntMaxVector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (IntMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (IntMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (IntMaxShuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static int[] prepare(int[] indices, int offset) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static int[] prepare(IntUnaryOperator f) {
+ int[] a = new int[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (int)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(int[] indices) {
+ int length = indices.length;
+ for (int si : indices) {
+ if (si >= (int)length || si < (int)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new IntMaxShuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
index 390c8026083..063b0c0d8e8 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
@@ -1099,7 +1099,7 @@ private static VectorBroadcastIntOp<IntVector, VectorMask<Integer>> broadcastInt
// and broadcast, but it would be more surprising not to continue
// the obvious pattern started by unary and binary.
- /**
+ /**
* {@inheritDoc} <!--workaround-->
* @see #lanewise(VectorOperators.Ternary,int,int,VectorMask)
* @see #lanewise(VectorOperators.Ternary,Vector,int,VectorMask)
@@ -2293,9 +2293,10 @@ IntVector sliceTemplate(int origin, Vector<Integer> v1) {
IntVector that = (IntVector) v1;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Integer> iota = iotaShuffle();
- VectorMask<Integer> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((int)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ IntVector iotaVector = (IntVector) iotaShuffle().toBitsVector();
+ IntVector filter = broadcast((int)(length() - origin));
+ VectorMask<Integer> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+ AbstractShuffle<Integer> iota = iotaShuffle(origin, 1, true);
return that.rearrange(iota).blend(this.rearrange(iota), blendMask);
}
@@ -2323,9 +2324,10 @@ IntVector slice(int origin,
@ForceInline
IntVector sliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Integer> iota = iotaShuffle();
- VectorMask<Integer> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((int)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ IntVector iotaVector = (IntVector) iotaShuffle().toBitsVector();
+ IntVector filter = broadcast((int)(length() - origin));
+ VectorMask<Integer> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+ AbstractShuffle<Integer> iota = iotaShuffle(origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2344,10 +2346,10 @@ IntVector sliceTemplate(int origin) {
IntVector that = (IntVector) w;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Integer> iota = iotaShuffle();
- VectorMask<Integer> blendMask = iota.toVector().compare((part == 0) ? VectorOperators.GE : VectorOperators.LT,
- (broadcast((int)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ IntVector iotaVector = (IntVector) iotaShuffle().toBitsVector();
+ IntVector filter = broadcast((int)origin);
+ VectorMask<Integer> blendMask = iotaVector.compare((part == 0) ? VectorOperators.GE : VectorOperators.LT, filter);
+ AbstractShuffle<Integer> iota = iotaShuffle(-origin, 1, true);
return that.blend(this.rearrange(iota), blendMask);
}
@@ -2384,10 +2386,10 @@ IntVector sliceTemplate(int origin) {
IntVector
unsliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Integer> iota = iotaShuffle();
- VectorMask<Integer> blendMask = iota.toVector().compare(VectorOperators.GE,
- (broadcast((int)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ IntVector iotaVector = (IntVector) iotaShuffle().toBitsVector();
+ IntVector filter = broadcast((int)origin);
+ VectorMask<Integer> blendMask = iotaVector.compare(VectorOperators.GE, filter);
+ AbstractShuffle<Integer> iota = iotaShuffle(-origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2410,13 +2412,11 @@ IntVector sliceTemplate(int origin) {
final
<S extends VectorShuffle<Integer>>
IntVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, null, int.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
}
@@ -2439,13 +2439,11 @@ IntVector rearrangeTemplate(Class<S> shuffletype,
M m) {
m.check(masktype, this);
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, masktype, int.class, length(),
- this, ws, m,
+ this, shuffle, m,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return !m_.laneIsSet(i) ? 0 : v1.lane(ei);
}));
}
@@ -2466,30 +2464,29 @@ IntVector rearrangeTemplate(Class<S> shuffletype,
S shuffle,
IntVector v) {
VectorMask<Integer> valid = shuffle.laneIsValid();
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
IntVector r0 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, int.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v0, s_, m_) -> v0.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
return v0.lane(ei);
}));
IntVector r1 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, int.class, length(),
- v, ws, null,
+ v, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
return r1.blend(r0, valid);
}
+ @Override
@ForceInline
- private final
- VectorShuffle<Integer> toShuffle0(IntSpecies dsp) {
+ final <F> VectorShuffle<F> bitsToShuffle0(AbstractSpecies<F> dsp) {
+ assert(dsp.length() == vspecies().length());
int[] a = toArray();
int[] sa = new int[a.length];
for (int i = 0; i < a.length; i++) {
@@ -2498,16 +2495,18 @@ VectorShuffle<Integer> toShuffle0(IntSpecies dsp) {
return VectorShuffle.fromArray(dsp, sa, 0);
}
- /*package-private*/
@ForceInline
- final
- VectorShuffle<Integer> toShuffleTemplate(Class<?> shuffleType) {
- IntSpecies vsp = vspecies();
- return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
- getClass(), int.class, length(),
- shuffleType, byte.class, length(),
- this, vsp,
- IntVector::toShuffle0);
+ final <F>
+ VectorShuffle<F> toShuffle(AbstractSpecies<F> dsp, boolean wrap) {
+ assert(dsp.elementSize() == vspecies().elementSize());
+ IntVector idx = this;
+ IntVector wrapped = idx.lanewise(VectorOperators.AND, length() - 1);
+ if (!wrap) {
+ IntVector wrappedEx = wrapped.lanewise(VectorOperators.SUB, length());
+ VectorMask<Integer> inBound = wrapped.compare(VectorOperators.EQ, idx);
+ wrapped = wrappedEx.blend(wrapped, inBound);
+ }
+ return wrapped.bitsToShuffle(dsp);
}
/**
@@ -3849,9 +3848,10 @@ static final class IntSpecies extends AbstractSpecies<Integer> {
private IntSpecies(VectorShape shape,
Class<? extends IntVector> vectorType,
Class<? extends AbstractMask<Integer>> maskType,
+ Class<? extends AbstractShuffle<Integer>> shuffleType,
Function<Object, IntVector> vectorFactory) {
super(shape, LaneType.of(int.class),
- vectorType, maskType,
+ vectorType, maskType, shuffleType,
vectorFactory);
assert(this.elementSize() == Integer.SIZE);
}
@@ -4137,6 +4137,7 @@ static IntSpecies species(VectorShape s) {
= new IntSpecies(VectorShape.S_64_BIT,
Int64Vector.class,
Int64Vector.Int64Mask.class,
+ Int64Vector.Int64Shuffle.class,
Int64Vector::new);
/** Species representing {@link IntVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
@@ -4144,6 +4145,7 @@ static IntSpecies species(VectorShape s) {
= new IntSpecies(VectorShape.S_128_BIT,
Int128Vector.class,
Int128Vector.Int128Mask.class,
+ Int128Vector.Int128Shuffle.class,
Int128Vector::new);
/** Species representing {@link IntVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
@@ -4151,6 +4153,7 @@ static IntSpecies species(VectorShape s) {
= new IntSpecies(VectorShape.S_256_BIT,
Int256Vector.class,
Int256Vector.Int256Mask.class,
+ Int256Vector.Int256Shuffle.class,
Int256Vector::new);
/** Species representing {@link IntVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
@@ -4158,6 +4161,7 @@ static IntSpecies species(VectorShape s) {
= new IntSpecies(VectorShape.S_512_BIT,
Int512Vector.class,
Int512Vector.Int512Mask.class,
+ Int512Vector.Int512Shuffle.class,
Int512Vector::new);
/** Species representing {@link IntVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
@@ -4165,6 +4169,7 @@ static IntSpecies species(VectorShape s) {
= new IntSpecies(VectorShape.S_Max_BIT,
IntMaxVector.class,
IntMaxVector.IntMaxMask.class,
+ IntMaxVector.IntMaxShuffle.class,
IntMaxVector::new);
/**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
index c65816a4d6c..8b57f1c498c 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
@@ -136,24 +136,15 @@ Long128Mask maskFromArray(boolean[] bits) {
@ForceInline
Long128Shuffle iotaShuffle() { return Long128Shuffle.IOTA; }
+ @Override
@ForceInline
Long128Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Long128Shuffle)VectorSupport.shuffleIota(ETYPE, Long128Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Long128Shuffle)VectorSupport.shuffleIota(ETYPE, Long128Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Long128Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Long128Shuffle shuffleFromBytes(byte[] reorder) { return new Long128Shuffle(reorder); }
-
- @Override
- @ForceInline
- Long128Shuffle shuffleFromArray(int[] indexes, int i) { return new Long128Shuffle(indexes, i); }
+ Long128Shuffle shuffleFromArray(int[] indices, int i) { return new Long128Shuffle(indices, i); }
@Override
@ForceInline
@@ -352,9 +343,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Long128Mask.class, (Long128Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Long> toShuffle() {
- return super.toShuffleTemplate(Long128Shuffle.class); // specialize
+ public final Long128Shuffle toShuffle() {
+ return (Long128Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -783,23 +781,26 @@ static final class Long128Shuffle extends AbstractShuffle<Long> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Long> ETYPE = long.class; // used by the JVM
- Long128Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Long128Shuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Long128Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Long128Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Long128Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Long128Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Long128Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public LongSpecies vspecies() {
return VSPECIES;
}
@@ -807,47 +808,122 @@ public LongSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final Long128Shuffle IOTA = new Long128Shuffle(IDENTITY);
@Override
@ForceInline
public Long128Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Long128Shuffle.class, this, VLENGTH,
- (s) -> ((Long128Vector)(((AbstractShuffle<Long>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Long128Vector toBitsVector() {
+ return (Long128Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Long128Vector toBitsVector0() {
+ return ((Long128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
@Override
@ForceInline
- public Long128Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Long128Shuffle.class, this, VLENGTH,
- (s) -> ((Long128Shuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
+ @Override
+ @ForceInline
+ public final Long128Mask laneIsValid() {
+ return (Long128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Long128Shuffle rearrange(VectorShuffle<Long> shuffle) {
+ Long128Shuffle concreteShuffle = (Long128Shuffle) shuffle;
+ return (Long128Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public Long128Shuffle rearrange(VectorShuffle<Long> shuffle) {
- Long128Shuffle s = (Long128Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final Long128Shuffle wrapIndexes() {
+ Long128Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Long128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Long128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Long128Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Long128Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
index 7ca3e43e92b..3f808fe1a2f 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
@@ -136,24 +136,15 @@ Long256Mask maskFromArray(boolean[] bits) {
@ForceInline
Long256Shuffle iotaShuffle() { return Long256Shuffle.IOTA; }
+ @Override
@ForceInline
Long256Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Long256Shuffle)VectorSupport.shuffleIota(ETYPE, Long256Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Long256Shuffle)VectorSupport.shuffleIota(ETYPE, Long256Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Long256Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Long256Shuffle shuffleFromBytes(byte[] reorder) { return new Long256Shuffle(reorder); }
-
- @Override
- @ForceInline
- Long256Shuffle shuffleFromArray(int[] indexes, int i) { return new Long256Shuffle(indexes, i); }
+ Long256Shuffle shuffleFromArray(int[] indices, int i) { return new Long256Shuffle(indices, i); }
@Override
@ForceInline
@@ -352,9 +343,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Long256Mask.class, (Long256Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Long> toShuffle() {
- return super.toShuffleTemplate(Long256Shuffle.class); // specialize
+ public final Long256Shuffle toShuffle() {
+ return (Long256Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -787,23 +785,26 @@ static final class Long256Shuffle extends AbstractShuffle<Long> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Long> ETYPE = long.class; // used by the JVM
- Long256Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Long256Shuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Long256Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Long256Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Long256Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Long256Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Long256Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public LongSpecies vspecies() {
return VSPECIES;
}
@@ -811,47 +812,122 @@ public LongSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final Long256Shuffle IOTA = new Long256Shuffle(IDENTITY);
@Override
@ForceInline
public Long256Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Long256Shuffle.class, this, VLENGTH,
- (s) -> ((Long256Vector)(((AbstractShuffle<Long>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Long256Vector toBitsVector() {
+ return (Long256Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Long256Vector toBitsVector0() {
+ return ((Long256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
@Override
@ForceInline
- public Long256Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Long256Shuffle.class, this, VLENGTH,
- (s) -> ((Long256Shuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
+ @Override
+ @ForceInline
+ public final Long256Mask laneIsValid() {
+ return (Long256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Long256Shuffle rearrange(VectorShuffle<Long> shuffle) {
+ Long256Shuffle concreteShuffle = (Long256Shuffle) shuffle;
+ return (Long256Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public Long256Shuffle rearrange(VectorShuffle<Long> shuffle) {
- Long256Shuffle s = (Long256Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final Long256Shuffle wrapIndexes() {
+ Long256Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Long256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Long256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Long256Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Long256Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
index 317cac1f110..3d5e00b09c6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
@@ -136,24 +136,15 @@ Long512Mask maskFromArray(boolean[] bits) {
@ForceInline
Long512Shuffle iotaShuffle() { return Long512Shuffle.IOTA; }
+ @Override
@ForceInline
Long512Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Long512Shuffle)VectorSupport.shuffleIota(ETYPE, Long512Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Long512Shuffle)VectorSupport.shuffleIota(ETYPE, Long512Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Long512Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Long512Shuffle shuffleFromBytes(byte[] reorder) { return new Long512Shuffle(reorder); }
-
- @Override
- @ForceInline
- Long512Shuffle shuffleFromArray(int[] indexes, int i) { return new Long512Shuffle(indexes, i); }
+ Long512Shuffle shuffleFromArray(int[] indices, int i) { return new Long512Shuffle(indices, i); }
@Override
@ForceInline
@@ -352,9 +343,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Long512Mask.class, (Long512Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Long> toShuffle() {
- return super.toShuffleTemplate(Long512Shuffle.class); // specialize
+ public final Long512Shuffle toShuffle() {
+ return (Long512Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -795,23 +793,26 @@ static final class Long512Shuffle extends AbstractShuffle<Long> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Long> ETYPE = long.class; // used by the JVM
- Long512Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Long512Shuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Long512Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Long512Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Long512Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Long512Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Long512Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public LongSpecies vspecies() {
return VSPECIES;
}
@@ -819,47 +820,122 @@ public LongSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final Long512Shuffle IOTA = new Long512Shuffle(IDENTITY);
@Override
@ForceInline
public Long512Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Long512Shuffle.class, this, VLENGTH,
- (s) -> ((Long512Vector)(((AbstractShuffle<Long>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Long512Vector toBitsVector() {
+ return (Long512Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Long512Vector toBitsVector0() {
+ return ((Long512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
@Override
@ForceInline
- public Long512Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Long512Shuffle.class, this, VLENGTH,
- (s) -> ((Long512Shuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
+ @Override
+ @ForceInline
+ public final Long512Mask laneIsValid() {
+ return (Long512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Long512Shuffle rearrange(VectorShuffle<Long> shuffle) {
+ Long512Shuffle concreteShuffle = (Long512Shuffle) shuffle;
+ return (Long512Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public Long512Shuffle rearrange(VectorShuffle<Long> shuffle) {
- Long512Shuffle s = (Long512Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final Long512Shuffle wrapIndexes() {
+ Long512Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Long512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Long512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Long512Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Long512Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
index b13712595db..d34905dbce0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
@@ -136,24 +136,15 @@ Long64Mask maskFromArray(boolean[] bits) {
@ForceInline
Long64Shuffle iotaShuffle() { return Long64Shuffle.IOTA; }
+ @Override
@ForceInline
Long64Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Long64Shuffle)VectorSupport.shuffleIota(ETYPE, Long64Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Long64Shuffle)VectorSupport.shuffleIota(ETYPE, Long64Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Long64Shuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- Long64Shuffle shuffleFromBytes(byte[] reorder) { return new Long64Shuffle(reorder); }
-
- @Override
- @ForceInline
- Long64Shuffle shuffleFromArray(int[] indexes, int i) { return new Long64Shuffle(indexes, i); }
+ Long64Shuffle shuffleFromArray(int[] indices, int i) { return new Long64Shuffle(indices, i); }
@Override
@ForceInline
@@ -352,9 +343,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Long64Mask.class, (Long64Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Long> toShuffle() {
- return super.toShuffleTemplate(Long64Shuffle.class); // specialize
+ public final Long64Shuffle toShuffle() {
+ return (Long64Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -781,23 +779,26 @@ static final class Long64Shuffle extends AbstractShuffle<Long> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Long> ETYPE = long.class; // used by the JVM
- Long64Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Long64Shuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Long64Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Long64Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Long64Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Long64Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Long64Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public LongSpecies vspecies() {
return VSPECIES;
}
@@ -805,47 +806,122 @@ public LongSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final Long64Shuffle IOTA = new Long64Shuffle(IDENTITY);
@Override
@ForceInline
public Long64Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Long64Shuffle.class, this, VLENGTH,
- (s) -> ((Long64Vector)(((AbstractShuffle<Long>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Long64Vector toBitsVector() {
+ return (Long64Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Long64Vector toBitsVector0() {
+ return ((Long64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
@Override
@ForceInline
- public Long64Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Long64Shuffle.class, this, VLENGTH,
- (s) -> ((Long64Shuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
+ @Override
+ @ForceInline
+ public final Long64Mask laneIsValid() {
+ return (Long64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Long64Shuffle rearrange(VectorShuffle<Long> shuffle) {
+ Long64Shuffle concreteShuffle = (Long64Shuffle) shuffle;
+ return (Long64Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public Long64Shuffle rearrange(VectorShuffle<Long> shuffle) {
- Long64Shuffle s = (Long64Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final Long64Shuffle wrapIndexes() {
+ Long64Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Long64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Long64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Long64Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Long64Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
index 9edc442be88..84ff9d17444 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
@@ -136,24 +136,15 @@ LongMaxMask maskFromArray(boolean[] bits) {
@ForceInline
LongMaxShuffle iotaShuffle() { return LongMaxShuffle.IOTA; }
+ @Override
@ForceInline
LongMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (LongMaxShuffle)VectorSupport.shuffleIota(ETYPE, LongMaxShuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (LongMaxShuffle)VectorSupport.shuffleIota(ETYPE, LongMaxShuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (LongMaxShuffle) iotaShuffleTemplate(start, step, wrap);
}
@Override
@ForceInline
- LongMaxShuffle shuffleFromBytes(byte[] reorder) { return new LongMaxShuffle(reorder); }
-
- @Override
- @ForceInline
- LongMaxShuffle shuffleFromArray(int[] indexes, int i) { return new LongMaxShuffle(indexes, i); }
+ LongMaxShuffle shuffleFromArray(int[] indices, int i) { return new LongMaxShuffle(indices, i); }
@Override
@ForceInline
@@ -352,9 +343,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, LongMaxMask.class, (LongMaxMask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Long> toShuffle() {
- return super.toShuffleTemplate(LongMaxShuffle.class); // specialize
+ public final LongMaxShuffle toShuffle() {
+ return (LongMaxShuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -781,23 +779,26 @@ static final class LongMaxShuffle extends AbstractShuffle<Long> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Long> ETYPE = long.class; // used by the JVM
- LongMaxShuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ LongMaxShuffle(long[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public LongMaxShuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ LongMaxShuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public LongMaxShuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ LongMaxShuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public LongMaxShuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ long[] indices() {
+ return (long[])getPayload();
}
@Override
+ @ForceInline
public LongSpecies vspecies() {
return VSPECIES;
}
@@ -805,47 +806,122 @@ public LongSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Long.MAX_VALUE);
+ assert(Long.MIN_VALUE <= -VLENGTH);
}
static final LongMaxShuffle IOTA = new LongMaxShuffle(IDENTITY);
@Override
@ForceInline
public LongMaxVector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, LongMaxShuffle.class, this, VLENGTH,
- (s) -> ((LongMaxVector)(((AbstractShuffle<Long>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ LongMaxVector toBitsVector() {
+ return (LongMaxVector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ LongMaxVector toBitsVector0() {
+ return ((LongMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+ }
+
+ @Override
+ @ForceInline
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
@Override
@ForceInline
- public LongMaxShuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, LongMaxShuffle.class, this, VLENGTH,
- (s) -> ((LongMaxShuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
+ public void intoArray(int[] a, int offset) {
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+ }
+
+ @Override
+ @ForceInline
+ public final LongMaxMask laneIsValid() {
+ return (LongMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final LongMaxShuffle rearrange(VectorShuffle<Long> shuffle) {
+ LongMaxShuffle concreteShuffle = (LongMaxShuffle) shuffle;
+ return (LongMaxShuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
}
@ForceInline
@Override
- public LongMaxShuffle rearrange(VectorShuffle<Long> shuffle) {
- LongMaxShuffle s = (LongMaxShuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final LongMaxShuffle wrapIndexes() {
+ LongMaxVector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (LongMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (LongMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (LongMaxShuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static long[] prepare(int[] indices, int offset) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static long[] prepare(IntUnaryOperator f) {
+ long[] a = new long[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (long)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(long[] indices) {
+ int length = indices.length;
+ for (long si : indices) {
+ if (si >= (long)length || si < (long)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new LongMaxShuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
index 43fedc2693b..cde68c8fb38 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
@@ -1012,7 +1012,7 @@ private static VectorBroadcastIntOp<LongVector, VectorMask<Long>> broadcastIntOp
// and broadcast, but it would be more surprising not to continue
// the obvious pattern started by unary and binary.
- /**
+ /**
* {@inheritDoc} <!--workaround-->
* @see #lanewise(VectorOperators.Ternary,long,long,VectorMask)
* @see #lanewise(VectorOperators.Ternary,Vector,long,VectorMask)
@@ -2159,9 +2159,10 @@ LongVector sliceTemplate(int origin, Vector<Long> v1) {
LongVector that = (LongVector) v1;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Long> iota = iotaShuffle();
- VectorMask<Long> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((long)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ LongVector iotaVector = (LongVector) iotaShuffle().toBitsVector();
+ LongVector filter = broadcast((long)(length() - origin));
+ VectorMask<Long> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+ AbstractShuffle<Long> iota = iotaShuffle(origin, 1, true);
return that.rearrange(iota).blend(this.rearrange(iota), blendMask);
}
@@ -2189,9 +2190,10 @@ LongVector slice(int origin,
@ForceInline
LongVector sliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Long> iota = iotaShuffle();
- VectorMask<Long> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((long)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ LongVector iotaVector = (LongVector) iotaShuffle().toBitsVector();
+ LongVector filter = broadcast((long)(length() - origin));
+ VectorMask<Long> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+ AbstractShuffle<Long> iota = iotaShuffle(origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2210,10 +2212,10 @@ LongVector sliceTemplate(int origin) {
LongVector that = (LongVector) w;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Long> iota = iotaShuffle();
- VectorMask<Long> blendMask = iota.toVector().compare((part == 0) ? VectorOperators.GE : VectorOperators.LT,
- (broadcast((long)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ LongVector iotaVector = (LongVector) iotaShuffle().toBitsVector();
+ LongVector filter = broadcast((long)origin);
+ VectorMask<Long> blendMask = iotaVector.compare((part == 0) ? VectorOperators.GE : VectorOperators.LT, filter);
+ AbstractShuffle<Long> iota = iotaShuffle(-origin, 1, true);
return that.blend(this.rearrange(iota), blendMask);
}
@@ -2250,10 +2252,10 @@ LongVector sliceTemplate(int origin) {
LongVector
unsliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Long> iota = iotaShuffle();
- VectorMask<Long> blendMask = iota.toVector().compare(VectorOperators.GE,
- (broadcast((long)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ LongVector iotaVector = (LongVector) iotaShuffle().toBitsVector();
+ LongVector filter = broadcast((long)origin);
+ VectorMask<Long> blendMask = iotaVector.compare(VectorOperators.GE, filter);
+ AbstractShuffle<Long> iota = iotaShuffle(-origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2276,13 +2278,11 @@ LongVector sliceTemplate(int origin) {
final
<S extends VectorShuffle<Long>>
LongVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, null, long.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
}
@@ -2305,13 +2305,11 @@ LongVector rearrangeTemplate(Class<S> shuffletype,
M m) {
m.check(masktype, this);
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, masktype, long.class, length(),
- this, ws, m,
+ this, shuffle, m,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return !m_.laneIsSet(i) ? 0 : v1.lane(ei);
}));
}
@@ -2332,30 +2330,29 @@ LongVector rearrangeTemplate(Class<S> shuffletype,
S shuffle,
LongVector v) {
VectorMask<Long> valid = shuffle.laneIsValid();
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
LongVector r0 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, long.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v0, s_, m_) -> v0.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
return v0.lane(ei);
}));
LongVector r1 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, long.class, length(),
- v, ws, null,
+ v, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
return r1.blend(r0, valid);
}
+ @Override
@ForceInline
- private final
- VectorShuffle<Long> toShuffle0(LongSpecies dsp) {
+ final <F> VectorShuffle<F> bitsToShuffle0(AbstractSpecies<F> dsp) {
+ assert(dsp.length() == vspecies().length());
long[] a = toArray();
int[] sa = new int[a.length];
for (int i = 0; i < a.length; i++) {
@@ -2364,16 +2361,18 @@ VectorShuffle<Long> toShuffle0(LongSpecies dsp) {
return VectorShuffle.fromArray(dsp, sa, 0);
}
- /*package-private*/
@ForceInline
- final
- VectorShuffle<Long> toShuffleTemplate(Class<?> shuffleType) {
- LongSpecies vsp = vspecies();
- return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
- getClass(), long.class, length(),
- shuffleType, byte.class, length(),
- this, vsp,
- LongVector::toShuffle0);
+ final <F>
+ VectorShuffle<F> toShuffle(AbstractSpecies<F> dsp, boolean wrap) {
+ assert(dsp.elementSize() == vspecies().elementSize());
+ LongVector idx = this;
+ LongVector wrapped = idx.lanewise(VectorOperators.AND, length() - 1);
+ if (!wrap) {
+ LongVector wrappedEx = wrapped.lanewise(VectorOperators.SUB, length());
+ VectorMask<Long> inBound = wrapped.compare(VectorOperators.EQ, idx);
+ wrapped = wrappedEx.blend(wrapped, inBound);
+ }
+ return wrapped.bitsToShuffle(dsp);
}
/**
@@ -3784,9 +3783,10 @@ static final class LongSpecies extends AbstractSpecies<Long> {
private LongSpecies(VectorShape shape,
Class<? extends LongVector> vectorType,
Class<? extends AbstractMask<Long>> maskType,
+ Class<? extends AbstractShuffle<Long>> shuffleType,
Function<Object, LongVector> vectorFactory) {
super(shape, LaneType.of(long.class),
- vectorType, maskType,
+ vectorType, maskType, shuffleType,
vectorFactory);
assert(this.elementSize() == Long.SIZE);
}
@@ -4063,6 +4063,7 @@ static LongSpecies species(VectorShape s) {
= new LongSpecies(VectorShape.S_64_BIT,
Long64Vector.class,
Long64Vector.Long64Mask.class,
+ Long64Vector.Long64Shuffle.class,
Long64Vector::new);
/** Species representing {@link LongVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
@@ -4070,6 +4071,7 @@ static LongSpecies species(VectorShape s) {
= new LongSpecies(VectorShape.S_128_BIT,
Long128Vector.class,
Long128Vector.Long128Mask.class,
+ Long128Vector.Long128Shuffle.class,
Long128Vector::new);
/** Species representing {@link LongVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
@@ -4077,6 +4079,7 @@ static LongSpecies species(VectorShape s) {
= new LongSpecies(VectorShape.S_256_BIT,
Long256Vector.class,
Long256Vector.Long256Mask.class,
+ Long256Vector.Long256Shuffle.class,
Long256Vector::new);
/** Species representing {@link LongVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
@@ -4084,6 +4087,7 @@ static LongSpecies species(VectorShape s) {
= new LongSpecies(VectorShape.S_512_BIT,
Long512Vector.class,
Long512Vector.Long512Mask.class,
+ Long512Vector.Long512Shuffle.class,
Long512Vector::new);
/** Species representing {@link LongVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
@@ -4091,6 +4095,7 @@ static LongSpecies species(VectorShape s) {
= new LongSpecies(VectorShape.S_Max_BIT,
LongMaxVector.class,
LongMaxVector.LongMaxMask.class,
+ LongMaxVector.LongMaxShuffle.class,
LongMaxVector::new);
/**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
index b013e4b2825..17ec4f72d2e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
@@ -141,24 +141,15 @@ Short128Mask maskFromArray(boolean[] bits) {
@ForceInline
Short128Shuffle iotaShuffle() { return Short128Shuffle.IOTA; }
+ @Override
@ForceInline
Short128Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Short128Shuffle)VectorSupport.shuffleIota(ETYPE, Short128Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Short128Shuffle)VectorSupport.shuffleIota(ETYPE, Short128Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Short128Shuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
}
@Override
@ForceInline
- Short128Shuffle shuffleFromBytes(byte[] reorder) { return new Short128Shuffle(reorder); }
-
- @Override
- @ForceInline
- Short128Shuffle shuffleFromArray(int[] indexes, int i) { return new Short128Shuffle(indexes, i); }
+ Short128Shuffle shuffleFromArray(int[] indices, int i) { return new Short128Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Short128Mask.class, (Short128Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Short> toShuffle() {
- return super.toShuffleTemplate(Short128Shuffle.class); // specialize
+ public final Short128Shuffle toShuffle() {
+ return (Short128Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -805,23 +803,26 @@ static final class Short128Shuffle extends AbstractShuffle<Short> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Short> ETYPE = short.class; // used by the JVM
- Short128Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Short128Shuffle(short[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Short128Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Short128Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Short128Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Short128Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Short128Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ short[] indices() {
+ return (short[])getPayload();
}
@Override
+ @ForceInline
public ShortSpecies vspecies() {
return VSPECIES;
}
@@ -829,47 +830,105 @@ public ShortSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Short.MAX_VALUE);
+ assert(Short.MIN_VALUE <= -VLENGTH);
}
static final Short128Shuffle IOTA = new Short128Shuffle(IDENTITY);
@Override
@ForceInline
public Short128Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Short128Shuffle.class, this, VLENGTH,
- (s) -> ((Short128Vector)(((AbstractShuffle<Short>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Short128Vector toBitsVector() {
+ return (Short128Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Short128Vector toBitsVector0() {
+ return ((Short128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Short128Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Short128Shuffle.class, this, VLENGTH,
- (s) -> ((Short128Shuffle)(((AbstractShuffle<Short>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_128;
+ Vector<Short> v = toBitsVector();
+ v.convertShape(VectorOperators.S2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.S2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ }
+
@Override
- public Short128Shuffle rearrange(VectorShuffle<Short> shuffle) {
- Short128Shuffle s = (Short128Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Short128Mask laneIsValid() {
+ return (Short128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Short128Shuffle rearrange(VectorShuffle<Short> shuffle) {
+ Short128Shuffle concreteShuffle = (Short128Shuffle) shuffle;
+ return (Short128Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Short128Shuffle wrapIndexes() {
+ Short128Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Short128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Short128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Short128Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static short[] prepare(int[] indices, int offset) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static short[] prepare(IntUnaryOperator f) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(short[] indices) {
+ int length = indices.length;
+ for (short si : indices) {
+ if (si >= (short)length || si < (short)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Short128Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
index af4c862eaf3..e7505779f18 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
@@ -141,24 +141,15 @@ Short256Mask maskFromArray(boolean[] bits) {
@ForceInline
Short256Shuffle iotaShuffle() { return Short256Shuffle.IOTA; }
+ @Override
@ForceInline
Short256Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Short256Shuffle)VectorSupport.shuffleIota(ETYPE, Short256Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Short256Shuffle)VectorSupport.shuffleIota(ETYPE, Short256Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Short256Shuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
}
@Override
@ForceInline
- Short256Shuffle shuffleFromBytes(byte[] reorder) { return new Short256Shuffle(reorder); }
-
- @Override
- @ForceInline
- Short256Shuffle shuffleFromArray(int[] indexes, int i) { return new Short256Shuffle(indexes, i); }
+ Short256Shuffle shuffleFromArray(int[] indices, int i) { return new Short256Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Short256Mask.class, (Short256Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Short> toShuffle() {
- return super.toShuffleTemplate(Short256Shuffle.class); // specialize
+ public final Short256Shuffle toShuffle() {
+ return (Short256Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -821,23 +819,26 @@ static final class Short256Shuffle extends AbstractShuffle<Short> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Short> ETYPE = short.class; // used by the JVM
- Short256Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Short256Shuffle(short[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Short256Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Short256Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Short256Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Short256Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Short256Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ short[] indices() {
+ return (short[])getPayload();
}
@Override
+ @ForceInline
public ShortSpecies vspecies() {
return VSPECIES;
}
@@ -845,47 +846,105 @@ public ShortSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Short.MAX_VALUE);
+ assert(Short.MIN_VALUE <= -VLENGTH);
}
static final Short256Shuffle IOTA = new Short256Shuffle(IDENTITY);
@Override
@ForceInline
public Short256Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Short256Shuffle.class, this, VLENGTH,
- (s) -> ((Short256Vector)(((AbstractShuffle<Short>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Short256Vector toBitsVector() {
+ return (Short256Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Short256Vector toBitsVector0() {
+ return ((Short256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Short256Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Short256Shuffle.class, this, VLENGTH,
- (s) -> ((Short256Shuffle)(((AbstractShuffle<Short>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_256;
+ Vector<Short> v = toBitsVector();
+ v.convertShape(VectorOperators.S2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.S2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ }
+
@Override
- public Short256Shuffle rearrange(VectorShuffle<Short> shuffle) {
- Short256Shuffle s = (Short256Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Short256Mask laneIsValid() {
+ return (Short256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Short256Shuffle rearrange(VectorShuffle<Short> shuffle) {
+ Short256Shuffle concreteShuffle = (Short256Shuffle) shuffle;
+ return (Short256Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Short256Shuffle wrapIndexes() {
+ Short256Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Short256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Short256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Short256Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static short[] prepare(int[] indices, int offset) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static short[] prepare(IntUnaryOperator f) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(short[] indices) {
+ int length = indices.length;
+ for (short si : indices) {
+ if (si >= (short)length || si < (short)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Short256Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
index 3bb019f3b7c..7ca0d00b37a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
@@ -141,24 +141,15 @@ Short512Mask maskFromArray(boolean[] bits) {
@ForceInline
Short512Shuffle iotaShuffle() { return Short512Shuffle.IOTA; }
+ @Override
@ForceInline
Short512Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Short512Shuffle)VectorSupport.shuffleIota(ETYPE, Short512Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Short512Shuffle)VectorSupport.shuffleIota(ETYPE, Short512Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Short512Shuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
}
@Override
@ForceInline
- Short512Shuffle shuffleFromBytes(byte[] reorder) { return new Short512Shuffle(reorder); }
-
- @Override
- @ForceInline
- Short512Shuffle shuffleFromArray(int[] indexes, int i) { return new Short512Shuffle(indexes, i); }
+ Short512Shuffle shuffleFromArray(int[] indices, int i) { return new Short512Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Short512Mask.class, (Short512Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Short> toShuffle() {
- return super.toShuffleTemplate(Short512Shuffle.class); // specialize
+ public final Short512Shuffle toShuffle() {
+ return (Short512Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -853,23 +851,26 @@ static final class Short512Shuffle extends AbstractShuffle<Short> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Short> ETYPE = short.class; // used by the JVM
- Short512Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Short512Shuffle(short[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Short512Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Short512Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Short512Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Short512Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Short512Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ short[] indices() {
+ return (short[])getPayload();
}
@Override
+ @ForceInline
public ShortSpecies vspecies() {
return VSPECIES;
}
@@ -877,47 +878,105 @@ public ShortSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Short.MAX_VALUE);
+ assert(Short.MIN_VALUE <= -VLENGTH);
}
static final Short512Shuffle IOTA = new Short512Shuffle(IDENTITY);
@Override
@ForceInline
public Short512Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Short512Shuffle.class, this, VLENGTH,
- (s) -> ((Short512Vector)(((AbstractShuffle<Short>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Short512Vector toBitsVector() {
+ return (Short512Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Short512Vector toBitsVector0() {
+ return ((Short512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Short512Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Short512Shuffle.class, this, VLENGTH,
- (s) -> ((Short512Shuffle)(((AbstractShuffle<Short>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_512;
+ Vector<Short> v = toBitsVector();
+ v.convertShape(VectorOperators.S2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.S2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ }
+
@Override
- public Short512Shuffle rearrange(VectorShuffle<Short> shuffle) {
- Short512Shuffle s = (Short512Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Short512Mask laneIsValid() {
+ return (Short512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Short512Shuffle rearrange(VectorShuffle<Short> shuffle) {
+ Short512Shuffle concreteShuffle = (Short512Shuffle) shuffle;
+ return (Short512Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Short512Shuffle wrapIndexes() {
+ Short512Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Short512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Short512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Short512Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static short[] prepare(int[] indices, int offset) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static short[] prepare(IntUnaryOperator f) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(short[] indices) {
+ int length = indices.length;
+ for (short si : indices) {
+ if (si >= (short)length || si < (short)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Short512Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
index 905e313e95c..4837bd3d687 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
@@ -141,24 +141,15 @@ Short64Mask maskFromArray(boolean[] bits) {
@ForceInline
Short64Shuffle iotaShuffle() { return Short64Shuffle.IOTA; }
+ @Override
@ForceInline
Short64Shuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (Short64Shuffle)VectorSupport.shuffleIota(ETYPE, Short64Shuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (Short64Shuffle)VectorSupport.shuffleIota(ETYPE, Short64Shuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (Short64Shuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
}
@Override
@ForceInline
- Short64Shuffle shuffleFromBytes(byte[] reorder) { return new Short64Shuffle(reorder); }
-
- @Override
- @ForceInline
- Short64Shuffle shuffleFromArray(int[] indexes, int i) { return new Short64Shuffle(indexes, i); }
+ Short64Shuffle shuffleFromArray(int[] indices, int i) { return new Short64Shuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, Short64Mask.class, (Short64Mask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Short> toShuffle() {
- return super.toShuffleTemplate(Short64Shuffle.class); // specialize
+ public final Short64Shuffle toShuffle() {
+ return (Short64Shuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -797,23 +795,26 @@ static final class Short64Shuffle extends AbstractShuffle<Short> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Short> ETYPE = short.class; // used by the JVM
- Short64Shuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ Short64Shuffle(short[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public Short64Shuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ Short64Shuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public Short64Shuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ Short64Shuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public Short64Shuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ short[] indices() {
+ return (short[])getPayload();
}
@Override
+ @ForceInline
public ShortSpecies vspecies() {
return VSPECIES;
}
@@ -821,47 +822,105 @@ public ShortSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Short.MAX_VALUE);
+ assert(Short.MIN_VALUE <= -VLENGTH);
}
static final Short64Shuffle IOTA = new Short64Shuffle(IDENTITY);
@Override
@ForceInline
public Short64Vector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, Short64Shuffle.class, this, VLENGTH,
- (s) -> ((Short64Vector)(((AbstractShuffle<Short>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ Short64Vector toBitsVector() {
+ return (Short64Vector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ Short64Vector toBitsVector0() {
+ return ((Short64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public Short64Shuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, Short64Shuffle.class, this, VLENGTH,
- (s) -> ((Short64Shuffle)(((AbstractShuffle<Short>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_64;
+ Vector<Short> v = toBitsVector();
+ v.convertShape(VectorOperators.S2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.S2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ }
+
@Override
- public Short64Shuffle rearrange(VectorShuffle<Short> shuffle) {
- Short64Shuffle s = (Short64Shuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final Short64Mask laneIsValid() {
+ return (Short64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final Short64Shuffle rearrange(VectorShuffle<Short> shuffle) {
+ Short64Shuffle concreteShuffle = (Short64Shuffle) shuffle;
+ return (Short64Shuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final Short64Shuffle wrapIndexes() {
+ Short64Vector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (Short64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (Short64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (Short64Shuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static short[] prepare(int[] indices, int offset) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static short[] prepare(IntUnaryOperator f) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(short[] indices) {
+ int length = indices.length;
+ for (short si : indices) {
+ if (si >= (short)length || si < (short)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new Short64Shuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
index 5bb1beee6ed..9b90756c826 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
@@ -141,24 +141,15 @@ ShortMaxMask maskFromArray(boolean[] bits) {
@ForceInline
ShortMaxShuffle iotaShuffle() { return ShortMaxShuffle.IOTA; }
+ @Override
@ForceInline
ShortMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return (ShortMaxShuffle)VectorSupport.shuffleIota(ETYPE, ShortMaxShuffle.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return (ShortMaxShuffle)VectorSupport.shuffleIota(ETYPE, ShortMaxShuffle.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+ return (ShortMaxShuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
}
@Override
@ForceInline
- ShortMaxShuffle shuffleFromBytes(byte[] reorder) { return new ShortMaxShuffle(reorder); }
-
- @Override
- @ForceInline
- ShortMaxShuffle shuffleFromArray(int[] indexes, int i) { return new ShortMaxShuffle(indexes, i); }
+ ShortMaxShuffle shuffleFromArray(int[] indices, int i) { return new ShortMaxShuffle(indices, i); }
@Override
@ForceInline
@@ -357,9 +348,16 @@ public final long reduceLanesToLong(VectorOperators.Associative op,
return (long) super.reduceLanesTemplate(op, ShortMaxMask.class, (ShortMaxMask) m); // specialized
}
+ @Override
+ @ForceInline
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+ return bitsToShuffleTemplate(dsp);
+ }
+
+ @Override
@ForceInline
- public VectorShuffle<Short> toShuffle() {
- return super.toShuffleTemplate(ShortMaxShuffle.class); // specialize
+ public final ShortMaxShuffle toShuffle() {
+ return (ShortMaxShuffle) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -791,23 +789,26 @@ static final class ShortMaxShuffle extends AbstractShuffle<Short> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
static final Class<Short> ETYPE = short.class; // used by the JVM
- ShortMaxShuffle(byte[] reorder) {
- super(VLENGTH, reorder);
+ ShortMaxShuffle(short[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public ShortMaxShuffle(int[] reorder) {
- super(VLENGTH, reorder);
+ ShortMaxShuffle(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public ShortMaxShuffle(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ ShortMaxShuffle(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public ShortMaxShuffle(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ short[] indices() {
+ return (short[])getPayload();
}
@Override
+ @ForceInline
public ShortSpecies vspecies() {
return VSPECIES;
}
@@ -815,47 +816,105 @@ public ShortSpecies vspecies() {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < Short.MAX_VALUE);
+ assert(Short.MIN_VALUE <= -VLENGTH);
}
static final ShortMaxShuffle IOTA = new ShortMaxShuffle(IDENTITY);
@Override
@ForceInline
public ShortMaxVector toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, ShortMaxShuffle.class, this, VLENGTH,
- (s) -> ((ShortMaxVector)(((AbstractShuffle<Short>)(s)).toVectorTemplate())));
+ return toBitsVector();
}
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ ShortMaxVector toBitsVector() {
+ return (ShortMaxVector) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ ShortMaxVector toBitsVector0() {
+ return ((ShortMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public ShortMaxShuffle wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, ShortMaxShuffle.class, this, VLENGTH,
- (s) -> ((ShortMaxShuffle)(((AbstractShuffle<Short>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
}
+ @Override
@ForceInline
+ public void intoArray(int[] a, int offset) {
+ VectorSpecies<Integer> species = IntVector.SPECIES_MAX;
+ Vector<Short> v = toBitsVector();
+ v.convertShape(VectorOperators.S2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.S2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ }
+
@Override
- public ShortMaxShuffle rearrange(VectorShuffle<Short> shuffle) {
- ShortMaxShuffle s = (ShortMaxShuffle) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ @ForceInline
+ public final ShortMaxMask laneIsValid() {
+ return (ShortMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
+ }
+
+ @ForceInline
+ @Override
+ public final ShortMaxShuffle rearrange(VectorShuffle<Short> shuffle) {
+ ShortMaxShuffle concreteShuffle = (ShortMaxShuffle) shuffle;
+ return (ShortMaxShuffle) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+ }
+
+ @ForceInline
+ @Override
+ public final ShortMaxShuffle wrapIndexes() {
+ ShortMaxVector v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = (ShortMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = (ShortMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return (ShortMaxShuffle) v.toShuffle(vspecies(), false);
+ }
+
+ private static short[] prepare(int[] indices, int offset) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static short[] prepare(IntUnaryOperator f) {
+ short[] a = new short[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = (short)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange(short[] indices) {
+ int length = indices.length;
+ for (short si : indices) {
+ if (si >= (short)length || si < (short)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new ShortMaxShuffle(r);
+ return true;
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
index 552967d82e7..3cf848f31d0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
@@ -1096,7 +1096,7 @@ private static VectorBroadcastIntOp<ShortVector, VectorMask<Short>> broadcastInt
// and broadcast, but it would be more surprising not to continue
// the obvious pattern started by unary and binary.
- /**
+ /**
* {@inheritDoc} <!--workaround-->
* @see #lanewise(VectorOperators.Ternary,short,short,VectorMask)
* @see #lanewise(VectorOperators.Ternary,Vector,short,VectorMask)
@@ -2309,9 +2309,10 @@ ShortVector sliceTemplate(int origin, Vector<Short> v1) {
ShortVector that = (ShortVector) v1;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Short> iota = iotaShuffle();
- VectorMask<Short> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((short)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ ShortVector iotaVector = (ShortVector) iotaShuffle().toBitsVector();
+ ShortVector filter = broadcast((short)(length() - origin));
+ VectorMask<Short> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+ AbstractShuffle<Short> iota = iotaShuffle(origin, 1, true);
return that.rearrange(iota).blend(this.rearrange(iota), blendMask);
}
@@ -2339,9 +2340,10 @@ ShortVector slice(int origin,
@ForceInline
ShortVector sliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Short> iota = iotaShuffle();
- VectorMask<Short> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast((short)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ ShortVector iotaVector = (ShortVector) iotaShuffle().toBitsVector();
+ ShortVector filter = broadcast((short)(length() - origin));
+ VectorMask<Short> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+ AbstractShuffle<Short> iota = iotaShuffle(origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2360,10 +2362,10 @@ ShortVector sliceTemplate(int origin) {
ShortVector that = (ShortVector) w;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Short> iota = iotaShuffle();
- VectorMask<Short> blendMask = iota.toVector().compare((part == 0) ? VectorOperators.GE : VectorOperators.LT,
- (broadcast((short)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ ShortVector iotaVector = (ShortVector) iotaShuffle().toBitsVector();
+ ShortVector filter = broadcast((short)origin);
+ VectorMask<Short> blendMask = iotaVector.compare((part == 0) ? VectorOperators.GE : VectorOperators.LT, filter);
+ AbstractShuffle<Short> iota = iotaShuffle(-origin, 1, true);
return that.blend(this.rearrange(iota), blendMask);
}
@@ -2400,10 +2402,10 @@ ShortVector sliceTemplate(int origin) {
ShortVector
unsliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<Short> iota = iotaShuffle();
- VectorMask<Short> blendMask = iota.toVector().compare(VectorOperators.GE,
- (broadcast((short)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ ShortVector iotaVector = (ShortVector) iotaShuffle().toBitsVector();
+ ShortVector filter = broadcast((short)origin);
+ VectorMask<Short> blendMask = iotaVector.compare(VectorOperators.GE, filter);
+ AbstractShuffle<Short> iota = iotaShuffle(-origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2426,13 +2428,11 @@ ShortVector sliceTemplate(int origin) {
final
<S extends VectorShuffle<Short>>
ShortVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, null, short.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
}
@@ -2455,13 +2455,11 @@ ShortVector rearrangeTemplate(Class<S> shuffletype,
M m) {
m.check(masktype, this);
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, masktype, short.class, length(),
- this, ws, m,
+ this, shuffle, m,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return !m_.laneIsSet(i) ? 0 : v1.lane(ei);
}));
}
@@ -2482,30 +2480,29 @@ ShortVector rearrangeTemplate(Class<S> shuffletype,
S shuffle,
ShortVector v) {
VectorMask<Short> valid = shuffle.laneIsValid();
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
ShortVector r0 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, short.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v0, s_, m_) -> v0.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
return v0.lane(ei);
}));
ShortVector r1 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, short.class, length(),
- v, ws, null,
+ v, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
return r1.blend(r0, valid);
}
+ @Override
@ForceInline
- private final
- VectorShuffle<Short> toShuffle0(ShortSpecies dsp) {
+ final <F> VectorShuffle<F> bitsToShuffle0(AbstractSpecies<F> dsp) {
+ assert(dsp.length() == vspecies().length());
short[] a = toArray();
int[] sa = new int[a.length];
for (int i = 0; i < a.length; i++) {
@@ -2514,16 +2511,18 @@ VectorShuffle<Short> toShuffle0(ShortSpecies dsp) {
return VectorShuffle.fromArray(dsp, sa, 0);
}
- /*package-private*/
@ForceInline
- final
- VectorShuffle<Short> toShuffleTemplate(Class<?> shuffleType) {
- ShortSpecies vsp = vspecies();
- return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
- getClass(), short.class, length(),
- shuffleType, byte.class, length(),
- this, vsp,
- ShortVector::toShuffle0);
+ final <F>
+ VectorShuffle<F> toShuffle(AbstractSpecies<F> dsp, boolean wrap) {
+ assert(dsp.elementSize() == vspecies().elementSize());
+ ShortVector idx = this;
+ ShortVector wrapped = idx.lanewise(VectorOperators.AND, length() - 1);
+ if (!wrap) {
+ ShortVector wrappedEx = wrapped.lanewise(VectorOperators.SUB, length());
+ VectorMask<Short> inBound = wrapped.compare(VectorOperators.EQ, idx);
+ wrapped = wrappedEx.blend(wrapped, inBound);
+ }
+ return wrapped.bitsToShuffle(dsp);
}
/**
@@ -4210,9 +4209,10 @@ static final class ShortSpecies extends AbstractSpecies<Short> {
private ShortSpecies(VectorShape shape,
Class<? extends ShortVector> vectorType,
Class<? extends AbstractMask<Short>> maskType,
+ Class<? extends AbstractShuffle<Short>> shuffleType,
Function<Object, ShortVector> vectorFactory) {
super(shape, LaneType.of(short.class),
- vectorType, maskType,
+ vectorType, maskType, shuffleType,
vectorFactory);
assert(this.elementSize() == Short.SIZE);
}
@@ -4498,6 +4498,7 @@ static ShortSpecies species(VectorShape s) {
= new ShortSpecies(VectorShape.S_64_BIT,
Short64Vector.class,
Short64Vector.Short64Mask.class,
+ Short64Vector.Short64Shuffle.class,
Short64Vector::new);
/** Species representing {@link ShortVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
@@ -4505,6 +4506,7 @@ static ShortSpecies species(VectorShape s) {
= new ShortSpecies(VectorShape.S_128_BIT,
Short128Vector.class,
Short128Vector.Short128Mask.class,
+ Short128Vector.Short128Shuffle.class,
Short128Vector::new);
/** Species representing {@link ShortVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
@@ -4512,6 +4514,7 @@ static ShortSpecies species(VectorShape s) {
= new ShortSpecies(VectorShape.S_256_BIT,
Short256Vector.class,
Short256Vector.Short256Mask.class,
+ Short256Vector.Short256Shuffle.class,
Short256Vector::new);
/** Species representing {@link ShortVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
@@ -4519,6 +4522,7 @@ static ShortSpecies species(VectorShape s) {
= new ShortSpecies(VectorShape.S_512_BIT,
Short512Vector.class,
Short512Vector.Short512Mask.class,
+ Short512Vector.Short512Shuffle.class,
Short512Vector::new);
/** Species representing {@link ShortVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
@@ -4526,6 +4530,7 @@ static ShortSpecies species(VectorShape s) {
= new ShortSpecies(VectorShape.S_Max_BIT,
ShortMaxVector.class,
ShortMaxVector.ShortMaxMask.class,
+ ShortMaxVector.ShortMaxShuffle.class,
ShortMaxVector::new);
/**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
index 5b6dd3d09ac..76d6392e48a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
index 1ffbcef821a..89e0d38bcb0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* 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,6 +124,7 @@ VectorSpecies<E> withLanes(Class<E> elementType) {
* @throws IllegalArgumentException if no such vector shape exists
* @see #vectorBitSize()
*/
+ @ForceInline
public static VectorShape forBitSize(int bitSize) {
switch (bitSize) {
case 64:
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java
index b046874c390..bc1780a81ac 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* 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,8 +133,8 @@
*/
@SuppressWarnings("exports")
public abstract class VectorShuffle<E> extends jdk.internal.vm.vector.VectorSupport.VectorShuffle<E> {
- VectorShuffle(byte[] reorder) {
- super(reorder);
+ VectorShuffle(Object indices) {
+ super(indices);
}
/**
@@ -556,7 +556,7 @@ private static int unzipIndex(int i, int vlen, int part) {
* @param i the lane index
* @return the {@code int} lane element at lane index {@code i}
*/
- public int laneSource(int i) { return toArray()[i]; }
+ public abstract int laneSource(int i);
/**
* Rearranges the lane elements of this shuffle selecting lane indexes
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
index 6cfe5f6d9d9..03cb0ae559e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* 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,8 @@
*/
package jdk.incubator.vector;
+import jdk.internal.vm.annotation.ForceInline;
+
import java.lang.foreign.MemorySegment;
import java.nio.ByteOrder;
@@ -342,6 +344,7 @@ public interface VectorSpecies<E> {
* @see #withLanes(Class)
* @see #withShape(VectorShape)
*/
+ @ForceInline
static <E> VectorSpecies<E> of(Class<E> elementType, VectorShape shape) {
LaneType laneType = LaneType.of(elementType);
return AbstractSpecies.findSpecies(elementType, laneType, shape);
@@ -367,6 +370,7 @@ static <E> VectorSpecies<E> of(Class<E> elementType, VectorShape shape) {
* or if the given type is not a valid {@code ETYPE}
* @see VectorSpecies#ofPreferred(Class)
*/
+ @ForceInline
static <E> VectorSpecies<E> ofLargestShape(Class<E> etype) {
return VectorSpecies.of(etype, VectorShape.largestShapeFor(etype));
}
@@ -410,6 +414,7 @@ static <E> VectorSpecies<E> ofLargestShape(Class<E> etype) {
* @see VectorShape#preferredShape()
* @see VectorSpecies#ofLargestShape(Class)
*/
+ @ForceInline
public static <E> VectorSpecies<E> ofPreferred(Class<E> etype) {
return of(etype, VectorShape.preferredShape());
}
@@ -432,6 +437,7 @@ public static <E> VectorSpecies<E> ofPreferred(Class<E> etype) {
* if the given {@code elementType} argument is not
* a valid vector {@code ETYPE}
*/
+ @ForceInline
static int elementSize(Class<?> elementType) {
return LaneType.of(elementType).elementSize;
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
index 7eb1d9810b1..835868e61cd 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
@@ -1229,7 +1229,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
// and broadcast, but it would be more surprising not to continue
// the obvious pattern started by unary and binary.
- /**
+ /**
* {@inheritDoc} <!--workaround-->
* @see #lanewise(VectorOperators.Ternary,$type$,$type$,VectorMask)
* @see #lanewise(VectorOperators.Ternary,Vector,$type$,VectorMask)
@@ -2685,9 +2685,15 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
$abstractvectortype$ that = ($abstractvectortype$) v1;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<$Boxtype$> iota = iotaShuffle();
- VectorMask<$Boxtype$> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast(($type$)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ $Bitstype$Vector iotaVector = ($Bitstype$Vector) iotaShuffle().toBitsVector();
+#if[FP]
+ $Bitstype$Vector filter = $Bitstype$Vector.broadcast(($Bitstype$Vector.$Bitstype$Species) vspecies().asIntegral(), ($bitstype$)(length() - origin));
+ VectorMask<$Boxtype$> blendMask = iotaVector.compare(VectorOperators.LT, filter).cast(vspecies());
+#else[FP]
+ $abstractvectortype$ filter = broadcast(($type$)(length() - origin));
+ VectorMask<$Boxtype$> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+#end[FP]
+ AbstractShuffle<$Boxtype$> iota = iotaShuffle(origin, 1, true);
return that.rearrange(iota).blend(this.rearrange(iota), blendMask);
}
@@ -2715,9 +2721,15 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
@ForceInline
$abstractvectortype$ sliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<$Boxtype$> iota = iotaShuffle();
- VectorMask<$Boxtype$> blendMask = iota.toVector().compare(VectorOperators.LT, (broadcast(($type$)(length() - origin))));
- iota = iotaShuffle(origin, 1, true);
+ $Bitstype$Vector iotaVector = ($Bitstype$Vector) iotaShuffle().toBitsVector();
+#if[FP]
+ $Bitstype$Vector filter = $Bitstype$Vector.broadcast(($Bitstype$Vector.$Bitstype$Species) vspecies().asIntegral(), ($bitstype$)(length() - origin));
+ VectorMask<$Boxtype$> blendMask = iotaVector.compare(VectorOperators.LT, filter).cast(vspecies());
+#else[FP]
+ $abstractvectortype$ filter = broadcast(($type$)(length() - origin));
+ VectorMask<$Boxtype$> blendMask = iotaVector.compare(VectorOperators.LT, filter);
+#end[FP]
+ AbstractShuffle<$Boxtype$> iota = iotaShuffle(origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2736,10 +2748,15 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
$abstractvectortype$ that = ($abstractvectortype$) w;
that.check(this);
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<$Boxtype$> iota = iotaShuffle();
- VectorMask<$Boxtype$> blendMask = iota.toVector().compare((part == 0) ? VectorOperators.GE : VectorOperators.LT,
- (broadcast(($type$)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ $Bitstype$Vector iotaVector = ($Bitstype$Vector) iotaShuffle().toBitsVector();
+#if[FP]
+ $Bitstype$Vector filter = $Bitstype$Vector.broadcast(($Bitstype$Vector.$Bitstype$Species) vspecies().asIntegral(), ($bitstype$)origin);
+ VectorMask<$Boxtype$> blendMask = iotaVector.compare((part == 0) ? VectorOperators.GE : VectorOperators.LT, filter).cast(vspecies());
+#else[FP]
+ $abstractvectortype$ filter = broadcast(($type$)origin);
+ VectorMask<$Boxtype$> blendMask = iotaVector.compare((part == 0) ? VectorOperators.GE : VectorOperators.LT, filter);
+#end[FP]
+ AbstractShuffle<$Boxtype$> iota = iotaShuffle(-origin, 1, true);
return that.blend(this.rearrange(iota), blendMask);
}
@@ -2776,10 +2793,15 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
$abstractvectortype$
unsliceTemplate(int origin) {
Objects.checkIndex(origin, length() + 1);
- VectorShuffle<$Boxtype$> iota = iotaShuffle();
- VectorMask<$Boxtype$> blendMask = iota.toVector().compare(VectorOperators.GE,
- (broadcast(($type$)(origin))));
- iota = iotaShuffle(-origin, 1, true);
+ $Bitstype$Vector iotaVector = ($Bitstype$Vector) iotaShuffle().toBitsVector();
+#if[FP]
+ $Bitstype$Vector filter = $Bitstype$Vector.broadcast(($Bitstype$Vector.$Bitstype$Species) vspecies().asIntegral(), ($bitstype$)origin);
+ VectorMask<$Boxtype$> blendMask = iotaVector.compare(VectorOperators.GE, filter).cast(vspecies());
+#else[FP]
+ $abstractvectortype$ filter = broadcast(($type$)origin);
+ VectorMask<$Boxtype$> blendMask = iotaVector.compare(VectorOperators.GE, filter);
+#end[FP]
+ AbstractShuffle<$Boxtype$> iota = iotaShuffle(-origin, 1, true);
return vspecies().zero().blend(this.rearrange(iota), blendMask);
}
@@ -2802,13 +2824,11 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
final
<S extends VectorShuffle<$Boxtype$>>
$abstractvectortype$ rearrangeTemplate(Class<S> shuffletype, S shuffle) {
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, null, $type$.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
}
@@ -2831,13 +2851,11 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
M m) {
m.check(masktype, this);
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
return VectorSupport.rearrangeOp(
getClass(), shuffletype, masktype, $type$.class, length(),
- this, ws, m,
+ this, shuffle, m,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return !m_.laneIsSet(i) ? 0 : v1.lane(ei);
}));
}
@@ -2858,48 +2876,61 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
S shuffle,
$abstractvectortype$ v) {
VectorMask<$Boxtype$> valid = shuffle.laneIsValid();
- @SuppressWarnings("unchecked")
- S ws = (S) shuffle.wrapIndexes();
$abstractvectortype$ r0 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, $type$.class, length(),
- this, ws, null,
+ this, shuffle, null,
(v0, s_, m_) -> v0.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
return v0.lane(ei);
}));
$abstractvectortype$ r1 =
VectorSupport.rearrangeOp(
getClass(), shuffletype, null, $type$.class, length(),
- v, ws, null,
+ v, shuffle, null,
(v1, s_, m_) -> v1.uOp((i, a) -> {
- int ei = s_.laneSource(i);
+ int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
return v1.lane(ei);
}));
return r1.blend(r0, valid);
}
+ @Override
@ForceInline
- private final
- VectorShuffle<$Boxtype$> toShuffle0($Type$Species dsp) {
+ final <F> VectorShuffle<F> bitsToShuffle0(AbstractSpecies<F> dsp) {
+#if[FP]
+ throw new AssertionError();
+#else[FP]
+ assert(dsp.length() == vspecies().length());
$type$[] a = toArray();
int[] sa = new int[a.length];
for (int i = 0; i < a.length; i++) {
sa[i] = (int) a[i];
}
return VectorShuffle.fromArray(dsp, sa, 0);
+#end[FP]
}
- /*package-private*/
@ForceInline
- final
- VectorShuffle<$Boxtype$> toShuffleTemplate(Class<?> shuffleType) {
- $Type$Species vsp = vspecies();
- return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
- getClass(), $type$.class, length(),
- shuffleType, byte.class, length(),
- this, vsp,
- $Type$Vector::toShuffle0);
+ final <F>
+ VectorShuffle<F> toShuffle(AbstractSpecies<F> dsp, boolean wrap) {
+ assert(dsp.elementSize() == vspecies().elementSize());
+#if[float]
+ IntVector idx = convert(VectorOperators.F2I, 0).reinterpretAsInts();
+#end[float]
+#if[double]
+ LongVector idx = convert(VectorOperators.D2L, 0).reinterpretAsLongs();
+#end[double]
+#if[!FP]
+ $Type$Vector idx = this;
+#end[!FP]
+ $Bitstype$Vector wrapped = idx.lanewise(VectorOperators.AND, length() - 1);
+ if (!wrap) {
+ $Bitstype$Vector wrappedEx = wrapped.lanewise(VectorOperators.SUB, length());
+ VectorMask<$Boxbitstype$> inBound = wrapped.compare(VectorOperators.EQ, idx);
+ wrapped = wrappedEx.blend(wrapped, inBound);
+ }
+ return wrapped.bitsToShuffle(dsp);
}
/**
@@ -5447,9 +5478,10 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
private $Type$Species(VectorShape shape,
Class<? extends $abstractvectortype$> vectorType,
Class<? extends AbstractMask<$Boxtype$>> maskType,
+ Class<? extends AbstractShuffle<$Boxtype$>> shuffleType,
Function<Object, $abstractvectortype$> vectorFactory) {
super(shape, LaneType.of($type$.class),
- vectorType, maskType,
+ vectorType, maskType, shuffleType,
vectorFactory);
assert(this.elementSize() == $Boxtype$.SIZE);
}
@@ -5742,6 +5774,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
= new $Type$Species(VectorShape.S_64_BIT,
$Type$64Vector.class,
$Type$64Vector.$Type$64Mask.class,
+ $Type$64Vector.$Type$64Shuffle.class,
$Type$64Vector::new);
/** Species representing {@link $Type$Vector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
@@ -5749,6 +5782,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
= new $Type$Species(VectorShape.S_128_BIT,
$Type$128Vector.class,
$Type$128Vector.$Type$128Mask.class,
+ $Type$128Vector.$Type$128Shuffle.class,
$Type$128Vector::new);
/** Species representing {@link $Type$Vector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
@@ -5756,6 +5790,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
= new $Type$Species(VectorShape.S_256_BIT,
$Type$256Vector.class,
$Type$256Vector.$Type$256Mask.class,
+ $Type$256Vector.$Type$256Shuffle.class,
$Type$256Vector::new);
/** Species representing {@link $Type$Vector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
@@ -5763,6 +5798,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
= new $Type$Species(VectorShape.S_512_BIT,
$Type$512Vector.class,
$Type$512Vector.$Type$512Mask.class,
+ $Type$512Vector.$Type$512Shuffle.class,
$Type$512Vector::new);
/** Species representing {@link $Type$Vector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
@@ -5770,6 +5806,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
= new $Type$Species(VectorShape.S_Max_BIT,
$Type$MaxVector.class,
$Type$MaxVector.$Type$MaxMask.class,
+ $Type$MaxVector.$Type$MaxShuffle.class,
$Type$MaxVector::new);
/**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
index 9752a795ea7..216f28fde87 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
@@ -143,24 +143,23 @@ final class $vectortype$ extends $abstractvectortype$ {
@ForceInline
$shuffletype$ iotaShuffle() { return $shuffletype$.IOTA; }
+ @Override
@ForceInline
$shuffletype$ iotaShuffle(int start, int step, boolean wrap) {
- if (wrap) {
- return ($shuffletype$)VectorSupport.shuffleIota(ETYPE, $shuffletype$.class, VSPECIES, VLENGTH, start, step, 1,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (VectorIntrinsics.wrapToRange(i*lstep + lstart, l))));
- } else {
- return ($shuffletype$)VectorSupport.shuffleIota(ETYPE, $shuffletype$.class, VSPECIES, VLENGTH, start, step, 0,
- (l, lstart, lstep, s) -> s.shuffleFromOp(i -> (i*lstep + lstart)));
- }
+#if[byte]
+ return ($shuffletype$) iotaShuffleTemplate((byte) start, (byte) step, wrap);
+#end[byte]
+#if[short]
+ return ($shuffletype$) iotaShuffleTemplate((short) start, (short) step, wrap);
+#end[short]
+#if[!byteOrShort]
+ return ($shuffletype$) iotaShuffleTemplate(start, step, wrap);
+#end[!byteOrShort]
}
@Override
@ForceInline
- $shuffletype$ shuffleFromBytes(byte[] reorder) { return new $shuffletype$(reorder); }
-
- @Override
- @ForceInline
- $shuffletype$ shuffleFromArray(int[] indexes, int i) { return new $shuffletype$(indexes, i); }
+ $shuffletype$ shuffleFromArray(int[] indices, int i) { return new $shuffletype$(indices, i); }
@Override
@ForceInline
@@ -361,9 +360,20 @@ final class $vectortype$ extends $abstractvectortype$ {
return (long) super.reduceLanesTemplate(op, $masktype$.class, ($masktype$) m); // specialized
}
+ @Override
@ForceInline
- public VectorShuffle<$Boxtype$> toShuffle() {
- return super.toShuffleTemplate($shuffletype$.class); // specialize
+ final <F> VectorShuffle<F> bitsToShuffle(AbstractSpecies<F> dsp) {
+#if[FP]
+ throw new AssertionError();
+#else[FP]
+ return bitsToShuffleTemplate(dsp);
+#end[FP]
+ }
+
+ @Override
+ @ForceInline
+ public final $shuffletype$ toShuffle() {
+ return ($shuffletype$) toShuffle(vspecies(), false);
}
// Specialized unary testing
@@ -1077,25 +1087,28 @@ final class $vectortype$ extends $abstractvectortype$ {
static final class $shuffletype$ extends AbstractShuffle<$Boxtype$> {
static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
- static final Class<$Boxtype$> ETYPE = $type$.class; // used by the JVM
+ static final Class<$Boxbitstype$> ETYPE = $bitstype$.class; // used by the JVM
- $shuffletype$(byte[] reorder) {
- super(VLENGTH, reorder);
+ $shuffletype$($bitstype$[] indices) {
+ super(indices);
+ assert(VLENGTH == indices.length);
+ assert(indicesInRange(indices));
}
- public $shuffletype$(int[] reorder) {
- super(VLENGTH, reorder);
+ $shuffletype$(int[] indices, int i) {
+ this(prepare(indices, i));
}
- public $shuffletype$(int[] reorder, int i) {
- super(VLENGTH, reorder, i);
+ $shuffletype$(IntUnaryOperator fn) {
+ this(prepare(fn));
}
- public $shuffletype$(IntUnaryOperator fn) {
- super(VLENGTH, fn);
+ $bitstype$[] indices() {
+ return ($bitstype$[])getPayload();
}
@Override
+ @ForceInline
public $Type$Species vspecies() {
return VSPECIES;
}
@@ -1103,47 +1116,166 @@ final class $vectortype$ extends $abstractvectortype$ {
static {
// There must be enough bits in the shuffle lanes to encode
// VLENGTH valid indexes and VLENGTH exceptional ones.
- assert(VLENGTH < Byte.MAX_VALUE);
- assert(Byte.MIN_VALUE <= -VLENGTH);
+ assert(VLENGTH < $Boxbitstype$.MAX_VALUE);
+ assert($Boxbitstype$.MIN_VALUE <= -VLENGTH);
}
static final $shuffletype$ IOTA = new $shuffletype$(IDENTITY);
+#if[FP]
@Override
@ForceInline
public $vectortype$ toVector() {
- return VectorSupport.shuffleToVector(VCLASS, ETYPE, $shuffletype$.class, this, VLENGTH,
- (s) -> (($vectortype$)(((AbstractShuffle<$Boxtype$>)(s)).toVectorTemplate())));
+ return ($vectortype$) toBitsVector().castShape(vspecies(), 0);
}
+#else[FP]
+ @Override
+ @ForceInline
+ public $vectortype$ toVector() {
+ return toBitsVector();
+ }
+#end[FP]
@Override
@ForceInline
- public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
- AbstractSpecies<F> species = (AbstractSpecies<F>) s;
- if (length() != species.laneCount())
- throw new IllegalArgumentException("VectorShuffle length and species length differ");
- int[] shuffleArray = toArray();
- return s.shuffleFromArray(shuffleArray, 0).check(s);
+ $bitsvectortype$ toBitsVector() {
+ return ($bitsvectortype$) super.toBitsVectorTemplate();
+ }
+
+ @Override
+ $bitsvectortype$ toBitsVector0() {
+ return (($bitsvectortype$) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
}
@Override
@ForceInline
- public $shuffletype$ wrapIndexes() {
- return VectorSupport.wrapShuffleIndexes(ETYPE, $shuffletype$.class, this, VLENGTH,
- (s) -> (($shuffletype$)(((AbstractShuffle<$Boxtype$>)(s)).wrapIndexesTemplate())));
+ public int laneSource(int i) {
+ return (int)toBitsVector().lane(i);
+ }
+
+ @Override
+ @ForceInline
+ public void intoArray(int[] a, int offset) {
+#if[byte]
+ VectorSpecies<Integer> species = IntVector.SPECIES_$BITS$;
+ Vector<Byte> v = toBitsVector();
+ v.convertShape(VectorOperators.B2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.B2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+ v.convertShape(VectorOperators.B2I, species, 2)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 2);
+ v.convertShape(VectorOperators.B2I, species, 3)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length() * 3);
+#end[byte]
+#if[short]
+ VectorSpecies<Integer> species = IntVector.SPECIES_$BITS$;
+ Vector<Short> v = toBitsVector();
+ v.convertShape(VectorOperators.S2I, species, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ v.convertShape(VectorOperators.S2I, species, 1)
+ .reinterpretAsInts()
+ .intoArray(a, offset + species.length());
+#end[short]
+#if[intOrFloat]
+ toBitsVector().intoArray(a, offset);
+#end[intOrFloat]
+#if[longOrDouble]
+ switch (length()) {
+ case 1 -> a[offset] = laneSource(0);
+ case 2 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 4 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 8 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ case 16 -> toBitsVector()
+ .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+ .reinterpretAsInts()
+ .intoArray(a, offset);
+ default -> {
+ VectorIntrinsics.checkFromIndexSize(offset, length(), a.length);
+ for (int i = 0; i < length(); i++) {
+ a[offset + i] = laneSource(i);
+ }
+ }
+ }
+#end[longOrDouble]
+ }
+
+ @Override
+ @ForceInline
+ public final $masktype$ laneIsValid() {
+ return ($masktype$) toBitsVector().compare(VectorOperators.GE, 0)
+ .cast(vspecies());
}
@ForceInline
@Override
- public $shuffletype$ rearrange(VectorShuffle<$Boxtype$> shuffle) {
- $shuffletype$ s = ($shuffletype$) shuffle;
- byte[] reorder1 = reorder();
- byte[] reorder2 = s.reorder();
- byte[] r = new byte[reorder1.length];
- for (int i = 0; i < reorder1.length; i++) {
- int ssi = reorder2[i];
- r[i] = reorder1[ssi]; // throws on exceptional index
+ public final $shuffletype$ rearrange(VectorShuffle<$Boxtype$> shuffle) {
+ $shuffletype$ concreteShuffle = ($shuffletype$) shuffle;
+#if[FP]
+ return ($shuffletype$) toBitsVector().rearrange(concreteShuffle.cast($Bitstype$Vector.SPECIES_$BITS$))
+ .toShuffle(vspecies(), false);
+#else[FP]
+ return ($shuffletype$) toBitsVector().rearrange(concreteShuffle)
+ .toShuffle(vspecies(), false);
+#end[FP]
+ }
+
+ @ForceInline
+ @Override
+ public final $shuffletype$ wrapIndexes() {
+ $bitsvectortype$ v = toBitsVector();
+ if ((length() & (length() - 1)) == 0) {
+ v = ($bitsvectortype$) v.lanewise(VectorOperators.AND, length() - 1);
+ } else {
+ v = ($bitsvectortype$) v.blend(v.lanewise(VectorOperators.ADD, length()),
+ v.compare(VectorOperators.LT, 0));
+ }
+ return ($shuffletype$) v.toShuffle(vspecies(), false);
+ }
+
+ private static $bitstype$[] prepare(int[] indices, int offset) {
+ $bitstype$[] a = new $bitstype$[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = indices[offset + i];
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = ($bitstype$)si;
+ }
+ return a;
+ }
+
+ private static $bitstype$[] prepare(IntUnaryOperator f) {
+ $bitstype$[] a = new $bitstype$[VLENGTH];
+ for (int i = 0; i < VLENGTH; i++) {
+ int si = f.applyAsInt(i);
+ si = partiallyWrapIndex(si, VLENGTH);
+ a[i] = ($bitstype$)si;
+ }
+ return a;
+ }
+
+ private static boolean indicesInRange($bitstype$[] indices) {
+ int length = indices.length;
+ for ($bitstype$ si : indices) {
+ if (si >= ($bitstype$)length || si < ($bitstype$)(-length)) {
+ String msg = ("index "+si+"out of range ["+length+"] in "+
+ java.util.Arrays.toString(indices));
+ throw new AssertionError(msg);
+ }
}
- return new $shuffletype$(r);
+ return true;
}
}
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
index 001ce5b5cac..ecc752e8014 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
@@ -1,6 +1,6 @@
/*
*
-* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/aarch64/AArch64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
index c0d6c4cdb84..2a8959e5d7f 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/amd64/AMD64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
index eda1eada737..622102a3a67 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/code/Architecture.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java
index 64b0600674f..f8cb10cf29b 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
index 894fca94a77..9c64126c62d 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/DirectHotSpotObjectConstantImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/DirectHotSpotObjectConstantImpl.java
index 8385aaa6560..c241af0348a 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/DirectHotSpotObjectConstantImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/DirectHotSpotObjectConstantImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotCompiledCodeStream.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
index ab7a57f2759..49dfdcea5a2 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotCompressedNullConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java
index 0becdf29976..370eaee7b3f 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompressedNullConstant.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstant.java
index e0ae6b4c881..81b25e6c51d 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstant.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstant.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotConstantPool.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
index f4f8736a2fe..6a9167e687b 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotJVMCICompilerConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
index d25a7c974a5..6bff3ce58cf 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotMetaspaceConstantImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
index 358441d0b22..55d5492c2f8 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotMethodHandleAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
index 3d3d140b1ca..4685ff4d1b4 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotObjectConstantImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
index e4a77daf0d4..cf3ac0f994a 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/HotSpotSpeculationLog.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
index 57cec3ef194..fd46e281c3b 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/SharedLibraryJVMCIReflection.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java
index ab8b3d335cb..d7e8fd37ab2 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/riscv64/RISCV64HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotJVMCIBackendFactory.java
index 9e7d7679cab..6e0eac91d61 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotJVMCIBackendFactory.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotJVMCIBackendFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/riscv64/RISCV64HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotVMConfig.java
index 7f19efc4566..1d52556522e 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotVMConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/MethodHandleAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java
index eb8b9721d49..f4aa7b28bed 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/ResolvedJavaMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
index 6ed99c6ad6e..760ff068005 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/riscv64/RISCV64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java
index 2da9d51cca2..976c09cb75b 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/services/Services.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
index 72c07b3ac98..d4171002247 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
index c171e10132a..69cabd5427d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
@@ -271,7 +271,7 @@ Content linkSeeReferenceOutput(Element holder,
}
if (utils.isExecutableElement(refMem)) {
if (refMemName.indexOf('(') < 0) {
- refMemName += utils.makeSignature((ExecutableElement) refMem, null, true);
+ refMemName += utils.makeSignature((ExecutableElement) refMem, null, false, true);
}
if (overriddenMethod != null) {
// The method to actually link.
diff --git a/src/jdk.jcmd/share/man/jinfo.md b/src/jdk.jcmd/share/man/jinfo.md
index 5e8603e0e08..b70bc4c45ee 100644
--- a/src/jdk.jcmd/share/man/jinfo.md
+++ b/src/jdk.jcmd/share/man/jinfo.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jcmd/share/man/jmap.md b/src/jdk.jcmd/share/man/jmap.md
index 1f986f97fab..b0352ad9194 100644
--- a/src/jdk.jcmd/share/man/jmap.md
+++ b/src/jdk.jcmd/share/man/jmap.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jcmd/share/man/jps.md b/src/jdk.jcmd/share/man/jps.md
index be3994c411e..2db93878801 100644
--- a/src/jdk.jcmd/share/man/jps.md
+++ b/src/jdk.jcmd/share/man/jps.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jcmd/share/man/jstack.md b/src/jdk.jcmd/share/man/jstack.md
index 84df235a70e..15849502d8c 100644
--- a/src/jdk.jcmd/share/man/jstack.md
+++ b/src/jdk.jcmd/share/man/jstack.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jcmd/share/man/jstat.md b/src/jdk.jcmd/share/man/jstat.md
index 795fc9caa40..324d0a48cb2 100644
--- a/src/jdk.jcmd/share/man/jstat.md
+++ b/src/jdk.jcmd/share/man/jstat.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
index e6859fd8d74..947fb1c8d66 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jconsole/share/man/jconsole.md b/src/jdk.jconsole/share/man/jconsole.md
index 59c84a0431a..6412937830b 100644
--- a/src/jdk.jconsole/share/man/jconsole.md
+++ b/src/jdk.jconsole/share/man/jconsole.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
index b3c6b5b6c64..c267d9748fd 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdeps/share/classes/com/sun/tools/javap/JavapTask.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
index 138a76b6f2e..0d02d664de2 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
index f19d8fce4bb..7fcd213cd0b 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
index 04e7b3fd0e0..c472ea48b6f 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdeps/share/classes/com/sun/tools/javap/Options.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java
index e93dd2daf85..503989f4900 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/Options.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java
index 884c0fa9f80..94c10f5a5f9 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/SourceWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java
index d899569724e..5b7de2a4565 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/StackMapWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
index d5e19bc4241..a1ad8854161 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties
index 02e277e2235..29bff0ffe54 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
index 1c98b4cac6a..3575f134dfc 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
index 4cc9e83070d..a759117f727 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
index 77c2fdd6b63..bc6137f7f13 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
index 35f59cac926..000425923c4 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdeps/share/man/javap.md b/src/jdk.jdeps/share/man/javap.md
index 814db56b3ba..d09ac57f196 100644
--- a/src/jdk.jdeps/share/man/javap.md
+++ b/src/jdk.jdeps/share/man/javap.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdeps/share/man/jdeprscan.md b/src/jdk.jdeps/share/man/jdeprscan.md
index 8f76b29aee3..788d82e09db 100644
--- a/src/jdk.jdeps/share/man/jdeprscan.md
+++ b/src/jdk.jdeps/share/man/jdeprscan.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdeps/share/man/jdeps.md b/src/jdk.jdeps/share/man/jdeps.md
index cb936bf3e01..52c2d4bffe4 100644
--- a/src/jdk.jdeps/share/man/jdeps.md
+++ b/src/jdk.jdeps/share/man/jdeps.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdi/share/classes/com/sun/jdi/ThreadReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
index fd1b97161c7..bccdf4cc8bf 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
index 04ec27a624d..f3aadd3677c 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
index 41a1972a937..8ab3d97ea58 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jdi/share/man/jdb.md b/src/jdk.jdi/share/man/jdb.md
index e163cbf5e23..75d2d9a150c 100644
--- a/src/jdk.jdi/share/man/jdb.md
+++ b/src/jdk.jdi/share/man/jdb.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java b/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java
index ae3ccf7f149..fdbc4c8807f 100644
--- a/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java
+++ b/src/jdk.jdi/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java
index 7f9c22f0234..8301de748da 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java
index 3f0611f9981..2cf56c67cb5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/classes/jdk/jfr/internal/periodic/BatchManager.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/BatchManager.java
index 8d51cb1de6f..ff4898bc926 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/BatchManager.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/BatchManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
index 781661a427f..4d947eea9a5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java
index 7e425b3bdb5..646150629f8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java
index 6d607557caf..42445d79e78 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
index c51c3afe331..1241993e762 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java b/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java
index 37487d7195a..b2f3f62fbe7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jfr/share/man/jfr.md b/src/jdk.jfr/share/man/jfr.md
index 185d7cfc3b3..b516c590084 100644
--- a/src/jdk.jfr/share/man/jfr.md
+++ b/src/jdk.jfr/share/man/jfr.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java
index bbf2bfacd00..fff585bb2dd 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
index f9a5463609a..86f68098453 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java
index 5e540be7ced..3ef42fb9aa0 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java
@@ -4,7 +4,9 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java
index 12e8708477c..910fe57b75a 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/ResourcePoolReader.java
@@ -4,7 +4,9 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
index 833b56ee5f3..31ed02a693c 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
index e54e62bafed..2beac29ca54 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
index 9c44e826b93..9bd20e1d843 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jlink/share/man/jlink.md b/src/jdk.jlink/share/man/jlink.md
index 8c344a692cb..74f2d119c69 100644
--- a/src/jdk.jlink/share/man/jlink.md
+++ b/src/jdk.jlink/share/man/jlink.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jlink/share/man/jmod.md b/src/jdk.jlink/share/man/jmod.md
index 273001b6a9a..6fd2aa54cf9 100644
--- a/src/jdk.jlink/share/man/jmod.md
+++ b/src/jdk.jlink/share/man/jmod.md
@@ -1,5 +1,5 @@
---
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java
index 1f86ce6fd23..433ea0fbe04 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jpackage/share/classes/jdk/jpackage/internal/Enquoter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Enquoter.java
index 5f016c3f4bf..51f97ad2cd6 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Enquoter.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Enquoter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java
index e8bc0cb6655..bec8fb86bef 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jpackage/share/native/common/ErrorHandling.cpp b/src/jdk.jpackage/share/native/common/ErrorHandling.cpp
index a3a4c2a9dfe..6d4daaaba05 100644
--- a/src/jdk.jpackage/share/native/common/ErrorHandling.cpp
+++ b/src/jdk.jpackage/share/native/common/ErrorHandling.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jpackage/share/native/common/Log.cpp b/src/jdk.jpackage/share/native/common/Log.cpp
index 8227bb1cce4..ecdeeb325a7 100644
--- a/src/jdk.jpackage/share/native/common/Log.cpp
+++ b/src/jdk.jpackage/share/native/common/Log.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jpackage/unix/classes/jdk/jpackage/internal/ShellScriptResource.java b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellScriptResource.java
index c6303636c66..268c6d173aa 100644
--- a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellScriptResource.java
+++ b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellScriptResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java
index 3d8982584e1..cbe772a3ae4 100644
--- a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java
+++ b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jpackage/windows/classes/jdk/jpackage/internal/WindowsRegistry.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsRegistry.java
index 7c4b6092901..7eb7b922667 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsRegistry.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsRegistry.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.jpackage/windows/native/libjpackage/jpackage.cpp b/src/jdk.jpackage/windows/native/libjpackage/jpackage.cpp
index 66fa92e3563..3e922bceb2c 100644
--- a/src/jdk.jpackage/windows/native/libjpackage/jpackage.cpp
+++ b/src/jdk.jpackage/windows/native/libjpackage/jpackage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.management.agent/share/classes/jdk/internal/agent/resources/agent.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties
index 5ee066fe825..323c4a1e1a4 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
index ec8882be5da..0641e98a135 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
index 9d408730cd0..ad2665e2ff4 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
index 011ae2fce6c..28e21825220 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
index 91cf39bdb3f..005dec54ea8 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
index 0f19b3060d2..ecaf1024d60 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
index 9fabc5c0b36..f4ff84db84e 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
index 5343c8e16e7..773042234e9 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
index a3c695df0eb..7c4f2559ce1 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
index 5d33a024cce..64fdd2634e3 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
index 51cf0186825..55e9da252f2 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
# 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.management.jfr/share/classes/jdk/management/jfr/FileDump.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FileDump.java
index 37ba2967326..75bf37e0b26 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FileDump.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FileDump.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.management/share/classes/com/sun/management/OperatingSystemMXBean.java b/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java
index d20d1ead35f..04b25081642 100644
--- a/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java
+++ b/src/jdk.management/share/classes/com/sun/management/OperatingSystemMXBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java b/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java
index 74ed636c9d6..ba11f16f81d 100644
--- a/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java
+++ b/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java
@@ -274,8 +274,13 @@ public double getProcessCpuLoad() {
}
private boolean isCpuSetSameAsHostCpuSet() {
- if (containerMetrics != null && containerMetrics.getCpuSetCpus() != null) {
- return containerMetrics.getCpuSetCpus().length == getHostOnlineCpuCount0();
+ if (containerMetrics != null) {
+ // The return value may change (including from non-null to null) and
+ // the call may involve I/O, so keep the result in a local variable.
+ int[] cpuSetCpus = containerMetrics.getCpuSetCpus();
+ if (cpuSetCpus != null) {
+ return cpuSetCpus.length == getHostOnlineCpuCount0();
+ }
}
return false;
}
diff --git a/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java
index fe35a4979cc..cb0f15fbd6b 100644
--- a/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java
+++ b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.naming.rmi/share/classes/module-info.java b/src/jdk.naming.rmi/share/classes/module-info.java
index f2ba8f7775f..4b91cd2bec9 100644
--- a/src/jdk.naming.rmi/share/classes/module-info.java
+++ b/src/jdk.naming.rmi/share/classes/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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.security.jgss/share/classes/com/sun/security/jgss/package-info.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java
index b7010b2e740..404299ef752 100644
--- a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java
+++ b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utils/IdealGraphVisualizer/Bytecodes/pom.xml b/src/utils/IdealGraphVisualizer/Bytecodes/pom.xml
index 1ac64b16a4a..78e1b328501 100644
--- a/src/utils/IdealGraphVisualizer/Bytecodes/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Bytecodes/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/pom.xml b/src/utils/IdealGraphVisualizer/Coordinator/pom.xml
index fcfad0ba233..77717b02121 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Coordinator/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/Data/pom.xml b/src/utils/IdealGraphVisualizer/Data/pom.xml
index f53a286ac58..30528879337 100644
--- a/src/utils/IdealGraphVisualizer/Data/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Data/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/Difference/pom.xml b/src/utils/IdealGraphVisualizer/Difference/pom.xml
index a266114671d..edbfc941399 100644
--- a/src/utils/IdealGraphVisualizer/Difference/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Difference/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/helper.js b/src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/helper.js
index 3426e74ba41..b68a027d945 100644
--- a/src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/helper.js
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/helper.js
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utils/IdealGraphVisualizer/FilterWindow/pom.xml b/src/utils/IdealGraphVisualizer/FilterWindow/pom.xml
index 5a6465f6bd3..26dd5b32ede 100644
--- a/src/utils/IdealGraphVisualizer/FilterWindow/pom.xml
+++ b/src/utils/IdealGraphVisualizer/FilterWindow/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/Graph/pom.xml b/src/utils/IdealGraphVisualizer/Graph/pom.xml
index cf12a6d0176..dd765ad3995 100644
--- a/src/utils/IdealGraphVisualizer/Graph/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Graph/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/pom.xml b/src/utils/IdealGraphVisualizer/HierarchicalLayout/pom.xml
index f5a40a346ee..cca1804eeff 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/pom.xml
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/Layout/pom.xml b/src/utils/IdealGraphVisualizer/Layout/pom.xml
index ebc39b0d466..05120e19cc3 100644
--- a/src/utils/IdealGraphVisualizer/Layout/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Layout/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/pom.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/pom.xml
index 45f69f8dcbf..fccf237d9b6 100644
--- a/src/utils/IdealGraphVisualizer/NetworkConnection/pom.xml
+++ b/src/utils/IdealGraphVisualizer/NetworkConnection/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/pom.xml b/src/utils/IdealGraphVisualizer/SelectionCoordinator/pom.xml
index 26f949a8f3c..6a4f799a5d1 100644
--- a/src/utils/IdealGraphVisualizer/SelectionCoordinator/pom.xml
+++ b/src/utils/IdealGraphVisualizer/SelectionCoordinator/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/pom.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/pom.xml
index 404b15f9a9a..2c184f97bc4 100644
--- a/src/utils/IdealGraphVisualizer/ServerCompiler/pom.xml
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
index 95a0b71c16d..1901edc6ed4 100644
--- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utils/IdealGraphVisualizer/Settings/pom.xml b/src/utils/IdealGraphVisualizer/Settings/pom.xml
index 74553c6b709..5ffca4ac7da 100644
--- a/src/utils/IdealGraphVisualizer/Settings/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Settings/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/Util/pom.xml b/src/utils/IdealGraphVisualizer/Util/pom.xml
index 18b846e9547..064f458b163 100644
--- a/src/utils/IdealGraphVisualizer/Util/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Util/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/View/pom.xml b/src/utils/IdealGraphVisualizer/View/pom.xml
index 8376871b3c6..3d5c5c2744d 100644
--- a/src/utils/IdealGraphVisualizer/View/pom.xml
+++ b/src/utils/IdealGraphVisualizer/View/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
index 3081825025f..e6cdbebbe52 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/ExportGraph.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/ExportGraph.java
index f176390d843..a86d3450668 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/ExportGraph.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/ExportGraph.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandAdjacentAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandAdjacentAction.java
index 49d58a11edf..daceaa708bd 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandAdjacentAction.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandAdjacentAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ModelAwareAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ModelAwareAction.java
index 0a09eba5ed0..ce373436d93 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ModelAwareAction.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ModelAwareAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/utils/IdealGraphVisualizer/application/pom.xml b/src/utils/IdealGraphVisualizer/application/pom.xml
index 25902816808..5bbf8417f09 100644
--- a/src/utils/IdealGraphVisualizer/application/pom.xml
+++ b/src/utils/IdealGraphVisualizer/application/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/IdealGraphVisualizer/branding/pom.xml b/src/utils/IdealGraphVisualizer/branding/pom.xml
index 3b00ced27cc..e63eb76f688 100644
--- a/src/utils/IdealGraphVisualizer/branding/pom.xml
+++ b/src/utils/IdealGraphVisualizer/branding/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/LogCompilation/pom.xml b/src/utils/LogCompilation/pom.xml
index e033a3fbc07..083df362610 100644
--- a/src/utils/LogCompilation/pom.xml
+++ b/src/utils/LogCompilation/pom.xml
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/utils/hsdis/binutils/hsdis-binutils.c b/src/utils/hsdis/binutils/hsdis-binutils.c
index 3e3362cac94..51877e85f46 100644
--- a/src/utils/hsdis/binutils/hsdis-binutils.c
+++ b/src/utils/hsdis/binutils/hsdis-binutils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
diff --git a/src/utils/hsdis/capstone/hsdis-capstone.c b/src/utils/hsdis/capstone/hsdis-capstone.c
index 015a617fd8a..d8a8719778d 100644
--- a/src/utils/hsdis/capstone/hsdis-capstone.c
+++ b/src/utils/hsdis/capstone/hsdis-capstone.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
diff --git a/src/utils/hsdis/hsdis.h b/src/utils/hsdis/hsdis.h
index ecb3a40a5b5..623df8baac0 100644
--- a/src/utils/hsdis/hsdis.h
+++ b/src/utils/hsdis/hsdis.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
diff --git a/src/utils/hsdis/llvm/hsdis-llvm.cpp b/src/utils/hsdis/llvm/hsdis-llvm.cpp
index ec08c9e6004..08717d459f8 100644
--- a/src/utils/hsdis/llvm/hsdis-llvm.cpp
+++ b/src/utils/hsdis/llvm/hsdis-llvm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
diff --git a/test/failure_handler/README b/test/failure_handler/README
index f629a1fbc91..4271bfbceaf 100644
--- a/test/failure_handler/README
+++ b/test/failure_handler/README
@@ -1,4 +1,4 @@
-Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
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/test/failure_handler/src/share/classes/jdk/test/failurehandler/action/ActionHelper.java b/test/failure_handler/src/share/classes/jdk/test/failurehandler/action/ActionHelper.java
index 76d4e8c1c71..5e1842bc237 100644
--- a/test/failure_handler/src/share/classes/jdk/test/failurehandler/action/ActionHelper.java
+++ b/test/failure_handler/src/share/classes/jdk/test/failurehandler/action/ActionHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/failure_handler/src/share/conf/linux.properties b/test/failure_handler/src/share/conf/linux.properties
index 3dc30333d45..44d96620ad0 100644
--- a/test/failure_handler/src/share/conf/linux.properties
+++ b/test/failure_handler/src/share/conf/linux.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/test/hotspot/gtest/code/test_codestrings.cpp b/test/hotspot/gtest/code/test_codestrings.cpp
index fcd14b3b9b2..ff01b6f94d1 100644
--- a/test/hotspot/gtest/code/test_codestrings.cpp
+++ b/test/hotspot/gtest/code/test_codestrings.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp b/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
index fcc3053bd85..efce358f298 100644
--- a/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/gc/g1/test_g1RegionMap.cpp b/test/hotspot/gtest/gc/g1/test_g1RegionMap.cpp
index f9075f27bd4..5340533c821 100644
--- a/test/hotspot/gtest/gc/g1/test_g1RegionMap.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1RegionMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/gc/g1/test_heapRegion.cpp b/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
index c8d30226176..240739757bf 100644
--- a/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
+++ b/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/gc/shared/test_oopStorageSet.cpp b/test/hotspot/gtest/gc/shared/test_oopStorageSet.cpp
index 947ff120d15..ca40b3343ee 100644
--- a/test/hotspot/gtest/gc/shared/test_oopStorageSet.cpp
+++ b/test/hotspot/gtest/gc/shared/test_oopStorageSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp
index f1470ea9338..8f51bf2db3b 100644
--- a/test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/gtest/gc/z/test_zForwarding.cpp b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
index ff2b3ee01e1..8868c6ac887 100644
--- a/test/hotspot/gtest/gc/z/test_zForwarding.cpp
+++ b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp b/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp
index 6e44993986b..bbebc77c64c 100644
--- a/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp
+++ b/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/opto/test_no_overflow_int.cpp b/test/hotspot/gtest/opto/test_no_overflow_int.cpp
index 7b4b4259bb8..fb8f48604b0 100644
--- a/test/hotspot/gtest/opto/test_no_overflow_int.cpp
+++ b/test/hotspot/gtest/opto/test_no_overflow_int.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/runtime/test_objectMonitor.cpp b/test/hotspot/gtest/runtime/test_objectMonitor.cpp
index fcdb102fcf7..99ea9011915 100644
--- a/test/hotspot/gtest/runtime/test_objectMonitor.cpp
+++ b/test/hotspot/gtest/runtime/test_objectMonitor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/utilities/test_align.cpp b/test/hotspot/gtest/utilities/test_align.cpp
index f5e6b9d9646..3638e1a5cd4 100644
--- a/test/hotspot/gtest/utilities/test_align.cpp
+++ b/test/hotspot/gtest/utilities/test_align.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/gtest/utilities/test_bitMap.cpp b/test/hotspot/gtest/utilities/test_bitMap.cpp
index aeb41693286..4ca1284cbb1 100644
--- a/test/hotspot/gtest/utilities/test_bitMap.cpp
+++ b/test/hotspot/gtest/utilities/test_bitMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 403dbf2ce5a..878e938d63a 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -120,10 +120,6 @@ runtime/ErrorHandling/MachCodeFramesInErrorFile.java 8313315 linux-ppc64le
runtime/cds/appcds/customLoader/HelloCustom_JFR.java 8241075 linux-all,windows-x64
runtime/NMT/VirtualAllocCommitMerge.java 8309698 linux-s390x
-# Fails with +UseCompactObjectHeaders on aarch64
-runtime/cds/appcds/SharedBaseAddress.java 8340212 linux-aarch64,macosx-aarch64
-runtime/cds/SharedBaseAddress.java 8340212 linux-aarch64,macosx-aarch64
-
applications/jcstress/copy.java 8229852 linux-all
containers/docker/TestJcmd.java 8278102 linux-all
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index f38c6a25003..055bd8aefc0 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -38,9 +38,8 @@ hotspot_all_no_apps = \
hotspot_compiler = \
compiler
-hotspot_compiler_xcomp = \
- :hotspot_compiler \
- -:tier1_compiler_not_xcomp
+hotspot_compiler_resourcehogs = \
+ resourcehogs/compiler
hotspot_gc = \
gc
@@ -159,8 +158,7 @@ tier1_common = \
tier1_compiler = \
:tier1_compiler_1 \
:tier1_compiler_2 \
- :tier1_compiler_3 \
- :tier1_compiler_not_xcomp
+ :tier1_compiler_3
hotspot_not_fast_compiler = \
:hotspot_compiler \
@@ -173,7 +171,6 @@ hotspot_slow_compiler = \
compiler/gcbarriers/PreserveFPRegistersTest.java \
compiler/memoryinitialization/ZeroTLABTest.java \
compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java \
- resourcehogs/compiler \
:hotspot_compiler_arraycopy
tier1_compiler_1 = \
@@ -218,6 +215,7 @@ tier1_compiler_3 = \
compiler/macronodes/ \
compiler/memoryinitialization/ \
compiler/osr/ \
+ compiler/profiling \
compiler/regalloc/ \
compiler/runtime/ \
compiler/startup/ \
@@ -263,29 +261,15 @@ tier2_compiler = \
-:hotspot_slow_compiler
tier3_compiler = \
- applications/ctw/modules \
- compiler/c2/ \
- compiler/ciReplay/ \
- compiler/compilercontrol/ \
- compiler/debug/ \
- compiler/oracle/ \
- compiler/print/ \
- compiler/relocations/ \
- compiler/tiered/ \
- compiler/vectorapi/ \
- compiler/whitebox/ \
- :hotspot_slow_compiler \
+ :hotspot_compiler \
-:tier1_compiler \
-:tier2_compiler
-tier1_compiler_not_xcomp = \
- compiler/profiling
tier1_compiler_no_valhalla = \
:tier1_compiler_1 \
:tier1_compiler_2 \
:tier1_compiler_3 \
- :tier1_compiler_not_xcomp \
-compiler/valhalla
ctw_1 = \
@@ -305,6 +289,9 @@ ctw_3 = \
applications/ctw/modules/jdk_localedata.java \
applications/ctw/modules/jdk_localedata_2.java
+tier2_ctw = \
+ :ctw_1
+
tier1_gc = \
:tier1_gc_1 \
:tier1_gc_2 \
@@ -661,6 +648,7 @@ tier2 = \
:hotspot_tier2_runtime_platform_agnostic \
:hotspot_tier2_serviceability \
:tier2_compiler \
+ :tier2_ctw \
:tier2_gc_epsilon \
:tier2_gc_shenandoah
diff --git a/test/hotspot/jtreg/applications/jcstress/TestGenerator.java b/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
index 81d8da356d6..cdb2093975b 100644
--- a/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
+++ b/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/applications/scimark/Scimark.java b/test/hotspot/jtreg/applications/scimark/Scimark.java
index c17fad0ac54..06700b74bf6 100644
--- a/test/hotspot/jtreg/applications/scimark/Scimark.java
+++ b/test/hotspot/jtreg/applications/scimark/Scimark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java b/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java
index 3944b78bc27..2781f4e6b67 100644
--- a/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java
+++ b/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/arguments/TestCompileThresholdScaling.java b/test/hotspot/jtreg/compiler/arguments/TestCompileThresholdScaling.java
index 47025572428..a0a2d97d4ef 100644
--- a/test/hotspot/jtreg/compiler/arguments/TestCompileThresholdScaling.java
+++ b/test/hotspot/jtreg/compiler/arguments/TestCompileThresholdScaling.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c1/TestPrintC1Statistics.java b/test/hotspot/jtreg/compiler/c1/TestPrintC1Statistics.java
index 3d62aa4d271..01461cfffa5 100644
--- a/test/hotspot/jtreg/compiler/c1/TestPrintC1Statistics.java
+++ b/test/hotspot/jtreg/compiler/c1/TestPrintC1Statistics.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c1/TestTraceLinearScanLevel.java b/test/hotspot/jtreg/compiler/c1/TestTraceLinearScanLevel.java
index 46a294388e6..233498d3c04 100644
--- a/test/hotspot/jtreg/compiler/c1/TestTraceLinearScanLevel.java
+++ b/test/hotspot/jtreg/compiler/c1/TestTraceLinearScanLevel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/ClearArray.java b/test/hotspot/jtreg/compiler/c2/ClearArray.java
index 25ff254c44f..ee376641650 100644
--- a/test/hotspot/jtreg/compiler/c2/ClearArray.java
+++ b/test/hotspot/jtreg/compiler/c2/ClearArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java b/test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java
index 63daec895ef..97744f526fb 100644
--- a/test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java
+++ b/test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java b/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java
index 3f82c3e00b3..794acd0957c 100644
--- a/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java
+++ b/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2018, 2020, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/irTests/DivINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/DivINodeIdealizationTests.java
index 1fd38bbae90..378f4895fac 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/DivINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/DivINodeIdealizationTests.java
@@ -127,7 +127,6 @@ public int identityThird(int x, int y) {
IRNode.DIV, "1",
IRNode.DIV_BY_ZERO_TRAP, "1"
})
- // Hotspot should keep the division because it may cause a division by zero trap
public int retainDenominator(int x, int y) {
return (x * y) / y;
}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/DivLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/DivLNodeIdealizationTests.java
index 452b9006637..cd3e27db27b 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/DivLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/DivLNodeIdealizationTests.java
@@ -125,7 +125,6 @@ public long identityThird(long x, long y) {
IRNode.DIV_L, "1",
IRNode.DIV_BY_ZERO_TRAP, "1"
})
- // Hotspot should keep the division because it may cause a division by zero trap
public long retainDenominator(long x, long y) {
return (x * y) / y;
}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/MaxMinINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/MaxMinINodeIdealizationTests.java
index f07cca4d1f1..66b80fae83a 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/MaxMinINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/MaxMinINodeIdealizationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, Arm Limited. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -28,7 +28,7 @@
/*
* @test
- * @bug 8290248 8312547
+ * @bug 8290248 8312547 8341781
* @summary Test that Ideal transformations of MaxINode and MinINode are
* being performed as expected.
* @library /test/lib /
@@ -46,10 +46,12 @@ public static void main(String[] args) {
"testMax2LNoLeftAdd",
"testMax3",
"testMax4",
+ "testMax5",
"testMin1",
"testMin2",
"testMin3",
- "testMin4"})
+ "testMin4",
+ "testMin5"})
public void runPositiveTests() {
int a = RunInfo.getRandom().nextInt();
int min = Integer.MIN_VALUE;
@@ -76,11 +78,13 @@ public void assertPositiveResult(int a) {
Asserts.assertEQ(Math.max(a >> 1, ((a >> 1) + 11)) , testMax2LNoLeftAdd(a));
Asserts.assertEQ(Math.max(a, a) , testMax3(a));
Asserts.assertEQ(0 , testMax4(a));
+ Asserts.assertEQ(8 , testMax5(a));
Asserts.assertEQ(Math.min(((a >> 1) + 100), Math.min(((a >> 1) + 150), 200)), testMin1(a));
Asserts.assertEQ(Math.min(((a >> 1) + 10), ((a >> 1) + 11)) , testMin2(a));
Asserts.assertEQ(Math.min(a, a) , testMin3(a));
Asserts.assertEQ(0 , testMin4(a));
+ Asserts.assertEQ(a & 7 , testMin5(a));
}
// The transformations in test*1 and test*2 can happen only if the compiler has enough information
@@ -219,6 +223,18 @@ public int testMin4(int i) {
return Math.min(i, 0) > 0 ? 1 : 0;
}
+ @Test
+ @IR(failOn = {IRNode.MAX_I})
+ public int testMax5(int i) {
+ return Math.max(i & 7, 8);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MIN_I})
+ public int testMin5(int i) {
+ return Math.min(i & 7, 8);
+ }
+
@Run(test = {"testTwoLevelsDifferentXY",
"testTwoLevelsNoLeftConstant",
"testTwoLevelsNoRightConstant",
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java
new file mode 100644
index 00000000000..2437b05586a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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 jdk.test.lib.Utils;
+
+import java.util.Random;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8332268
+ * @summary Test that Ideal transformations of ModINode* are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.ModINodeIdealizationTests
+ */
+public class ModINodeIdealizationTests {
+ public static final int RANDOM_POWER_OF_2 = 1 << (1 + Utils.getRandomInstance().nextInt(30));
+
+ public static void main(String[] args) {
+ TestFramework.run();
+ }
+
+ @Run(test = {"constant", "constantAgain", "powerOf2", "powerOf2Random", "powerOf2Minus1",
+ "positivePowerOf2", "positivePowerOf2Random"})
+ public void runMethod() {
+ int a = RunInfo.getRandom().nextInt();
+ a = (a == 0) ? 2 : a;
+ int b = RunInfo.getRandom().nextInt();
+ b = (b == 0) ? 2 : b;
+
+ int min = Integer.MIN_VALUE;
+ int max = Integer.MAX_VALUE;
+
+ assertResult(0, 0, true);
+ assertResult(a, b, false);
+ assertResult(min, min, false);
+ assertResult(max, max, false);
+ }
+
+ @DontCompile
+ public void assertResult(int a, int b, boolean shouldThrow) {
+ try {
+ Asserts.assertEQ(a % a, constant(a));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ Asserts.assertEQ(a % 32, powerOf2(a));
+ Asserts.assertEQ(a % RANDOM_POWER_OF_2, powerOf2Random(a));
+ Asserts.assertEQ(Math.max(0, a) % 32, positivePowerOf2(a));
+ Asserts.assertEQ(Math.max(0, a) % RANDOM_POWER_OF_2, positivePowerOf2Random(a));
+ Asserts.assertEQ(a % 127, powerOf2Minus1(a));
+ Asserts.assertEQ(a % 1, constantAgain(a));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_I, IRNode.MUL})
+ @IR(counts = {IRNode.DIV_BY_ZERO_TRAP, "1"})
+ // Checks x % x => 0
+ public int constant(int x) {
+ return x % x;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_I})
+ // Checks x % 1 => 0
+ public int constantAgain(int x) {
+ return x % 1;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_I, IRNode.RSHIFT, IRNode.ADD, IRNode.SUB})
+ @IR(counts = {IRNode.AND_I, "1"})
+ public int positivePowerOf2(int x) {
+ return Math.max(0, x) % 32;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_I, IRNode.RSHIFT, IRNode.ADD, IRNode.SUB})
+ @IR(counts = {IRNode.AND_I, "1"})
+ public int positivePowerOf2Random(int x) {
+ return Math.max(0, x) % RANDOM_POWER_OF_2;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_I, IRNode.DIV})
+ @IR(counts = {IRNode.AND_I, "1"})
+ public int powerOf2(int x) {
+ return x % 32;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_I, IRNode.DIV})
+ @IR(counts = {IRNode.AND_I, "1"})
+ public int powerOf2Random(int x) {
+ return x % RANDOM_POWER_OF_2;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_I})
+ @IR(counts = {IRNode.AND_I, ">=1", IRNode.RSHIFT, ">=1", IRNode.CMP_I, "2"})
+ // Special optimization for the case 2^k-1 for bigger k
+ public int powerOf2Minus1(int x) {
+ return x % 127;
+ }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java
new file mode 100644
index 00000000000..515a7d535f4
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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 jdk.test.lib.Utils;
+
+import java.util.Random;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8267265
+ * @summary Test that Ideal transformations of ModLNode* are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.ModLNodeIdealizationTests
+ */
+public class ModLNodeIdealizationTests {
+ public static final long RANDOM_POWER_OF_2 = 1L << (1 + Utils.getRandomInstance().nextInt(62));
+
+ public static void main(String[] args) {
+ TestFramework.run();
+ }
+
+ @Run(test = {"constant", "constantAgain", "powerOf2", "powerOf2Random", "powerOf2Minus1"})
+ public void runMethod() {
+ long a = RunInfo.getRandom().nextLong();
+ a = (a == 0) ? 2 : a;
+ long b = RunInfo.getRandom().nextLong();
+ b = (b == 0) ? 2 : b;
+
+ long min = Long.MIN_VALUE;
+ long max = Long.MAX_VALUE;
+
+ assertResult(0, 0, true);
+ assertResult(a, b, false);
+ assertResult(min, min, false);
+ assertResult(max, max, false);
+ }
+
+ @DontCompile
+ public void assertResult(long a, long b, boolean shouldThrow) {
+ try {
+ Asserts.assertEQ(a % a, constant(a));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ Asserts.assertEQ(a % (1L << 33), powerOf2(a));
+ Asserts.assertEQ(a % ((1L << 33) - 1), powerOf2Minus1(a));
+ Asserts.assertEQ(a % 1, constantAgain(a));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_L})
+ @IR(counts = {IRNode.DIV_BY_ZERO_TRAP, "1"})
+ // Checks x % x => 0
+ public long constant(long x) {
+ return x % x;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_L})
+ // Checks x % 1 => 0
+ public long constantAgain(long x) {
+ return x % 1;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_L, IRNode.DIV})
+ @IR(counts = {IRNode.AND_L, "1"})
+ // If the dividend is positive, and divisor is of the form 2^k, we can use a simple bit mask.
+ public long powerOf2(long x) {
+ return x % (1L << 33);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_L, IRNode.DIV})
+ @IR(counts = {IRNode.AND_L, "1"})
+ // If the dividend is positive, and divisor is of the form 2^k, we can use a simple bit mask.
+ public long powerOf2Random(long x) {
+ return x % RANDOM_POWER_OF_2;
+ }
+
+ @Test
+ @IR(failOn = {IRNode.MOD_L})
+ @IR(counts = {IRNode.AND_L, ">=1", IRNode.RSHIFT, ">=1", IRNode.CMP_L, "2"})
+ // Special optimization for the case 2^k-1 for bigger k
+ public long powerOf2Minus1(long x) {
+ return x % ((1L << 33) - 1);
+ }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIterativeEA.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIterativeEA.java
index 0229fdc3038..4bb1fb01e02 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIterativeEA.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIterativeEA.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java b/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
new file mode 100644
index 00000000000..ef2a47ee614
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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.*;
+import java.util.Random;
+import jdk.test.lib.Utils;
+
+/*
+ * @test
+ * @bug 8341781
+ * @summary Test identities of MinNodes and MaxNodes.
+ * @key randomness
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestMinMaxIdentities
+ */
+
+public class TestMinMaxIdentities {
+ private static final Random RANDOM = Utils.getRandomInstance();
+
+ public static void main(String[] args) {
+ TestFramework.run();
+ }
+
+ @Run(test = { "intMinMin", "intMinMax", "intMaxMin", "intMaxMax",
+ "longMinMin", "longMinMax", "longMaxMin", "longMaxMax",
+ "floatMinMin", "floatMaxMax", "doubleMinMin", "doubleMaxMax",
+ "floatMinMax", "floatMaxMin", "doubleMinMax", "doubleMaxMin" })
+ public void runMethod() {
+ assertResult(10, 20, 10L, 20L, 10.f, 20.f, 10.0, 20.0);
+ assertResult(20, 10, 20L, 10L, 20.f, 10.f, 20.0, 10.0);
+
+ assertResult(RANDOM.nextInt(), RANDOM.nextInt(), RANDOM.nextLong(), RANDOM.nextLong(), RANDOM.nextFloat(), RANDOM.nextFloat(), RANDOM.nextDouble(), RANDOM.nextDouble());
+ assertResult(RANDOM.nextInt(), RANDOM.nextInt(), RANDOM.nextLong(), RANDOM.nextLong(), RANDOM.nextFloat(), RANDOM.nextFloat(), RANDOM.nextDouble(), RANDOM.nextDouble());
+
+ assertResult(Integer.MAX_VALUE, Integer.MIN_VALUE, Long.MAX_VALUE, Long.MIN_VALUE, Float.POSITIVE_INFINITY, Float.NaN, Double.POSITIVE_INFINITY, Double.NaN);
+ assertResult(Integer.MIN_VALUE, Integer.MAX_VALUE, Long.MIN_VALUE, Long.MAX_VALUE, Float.NaN, Float.POSITIVE_INFINITY, Double.NaN, Double.POSITIVE_INFINITY);
+ }
+
+ @DontCompile
+ public void assertResult(int iA, int iB, long lA, long lB, float fA, float fB, double dA, double dB) {
+ Asserts.assertEQ(Math.min(iA, Math.min(iA, iB)), intMinMin(iA, iB));
+ Asserts.assertEQ(Math.min(iA, Math.max(iA, iB)), intMinMax(iA, iB));
+ Asserts.assertEQ(Math.max(iA, Math.min(iA, iB)), intMaxMin(iA, iB));
+ Asserts.assertEQ(Math.max(iA, Math.max(iA, iB)), intMaxMax(iA, iB));
+
+ Asserts.assertEQ(Math.min(lA, Math.min(lA, lB)), longMinMin(lA, lB));
+ Asserts.assertEQ(Math.min(lA, Math.max(lA, lB)), longMinMax(lA, lB));
+ Asserts.assertEQ(Math.max(lA, Math.min(lA, lB)), longMaxMin(lA, lB));
+ Asserts.assertEQ(Math.max(lA, Math.max(lA, lB)), longMaxMax(lA, lB));
+
+ Asserts.assertEQ(Math.min(fA, Math.min(fA, fB)), floatMinMin(fA, fB));
+ Asserts.assertEQ(Math.max(fA, Math.max(fA, fB)), floatMaxMax(fA, fB));
+
+ Asserts.assertEQ(Math.min(dA, Math.min(dA, dB)), doubleMinMin(dA, dB));
+ Asserts.assertEQ(Math.max(dA, Math.max(dA, dB)), doubleMaxMax(dA, dB));
+
+ // Due to NaN, these identities cannot be simplified.
+
+ Asserts.assertEQ(Math.min(fA, Math.max(fA, fB)), floatMinMax(fA, fB));
+ Asserts.assertEQ(Math.max(fA, Math.min(fA, fB)), floatMaxMin(fA, fB));
+ Asserts.assertEQ(Math.min(dA, Math.max(dA, dB)), doubleMinMax(dA, dB));
+ Asserts.assertEQ(Math.max(dA, Math.min(dA, dB)), doubleMaxMin(dA, dB));
+ }
+
+ // Integers
+
+ @Test
+ @IR(counts = { IRNode.MIN_I, "1" })
+ public int intMinMin(int a, int b) {
+ return Math.min(a, Math.min(a, b));
+ }
+
+ @Test
+ @IR(failOn = { IRNode.MIN_I, IRNode.MAX_I })
+ public int intMinMax(int a, int b) {
+ return Math.min(a, Math.max(a, b));
+ }
+
+ @Test
+ @IR(failOn = { IRNode.MIN_I, IRNode.MAX_I })
+ public int intMaxMin(int a, int b) {
+ return Math.max(a, Math.min(a, b));
+ }
+
+ @Test
+ @IR(counts = { IRNode.MAX_I, "1" })
+ public int intMaxMax(int a, int b) {
+ return Math.max(a, Math.max(a, b));
+ }
+
+ // Longs
+
+ // As Math.min/max(LL) is not intrinsified, it first needs to be transformed into CMoveL and then MinL/MaxL before
+ // the identity can be matched. However, the outer min/max is not transformed into CMove because of the CMove cost model.
+ // As JDK-8307513 adds intrinsics for the methods, the tests will be updated then.
+
+ @Test
+ @IR(applyIfPlatform = { "riscv64", "false" }, phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MIN_L, "1" })
+ public long longMinMin(long a, long b) {
+ return Math.min(a, Math.min(a, b));
+ }
+
+ @Test
+ @IR(applyIfPlatform = { "riscv64", "false" }, phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MIN_L, "1" })
+ public long longMinMax(long a, long b) {
+ return Math.min(a, Math.max(a, b));
+ }
+
+ @Test
+ @IR(applyIfPlatform = { "riscv64", "false" }, phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MAX_L, "1" })
+ public long longMaxMin(long a, long b) {
+ return Math.max(a, Math.min(a, b));
+ }
+
+ @Test
+ @IR(applyIfPlatform = { "riscv64", "false" }, phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MAX_L, "1" })
+ public long longMaxMax(long a, long b) {
+ return Math.max(a, Math.max(a, b));
+ }
+
+ // Floats
+
+ @Test
+ @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_F, "1" })
+ public float floatMinMin(float a, float b) {
+ return Math.min(a, Math.min(a, b));
+ }
+
+ @Test
+ @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MAX_F, "1" })
+ public float floatMaxMax(float a, float b) {
+ return Math.max(a, Math.max(a, b));
+ }
+
+ // Doubles
+
+ @Test
+ @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_D, "1" })
+ public double doubleMinMin(double a, double b) {
+ return Math.min(a, Math.min(a, b));
+ }
+
+ @Test
+ @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MAX_D, "1" })
+ public double doubleMaxMax(double a, double b) {
+ return Math.max(a, Math.max(a, b));
+ }
+
+ // Float and double identities that cannot be simplified due to NaN
+
+ @Test
+ @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_F, "1", IRNode.MAX_F, "1" })
+ public float floatMinMax(float a, float b) {
+ return Math.min(a, Math.max(a, b));
+ }
+
+ @Test
+ @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_F, "1", IRNode.MAX_F, "1" })
+ public float floatMaxMin(float a, float b) {
+ return Math.max(a, Math.min(a, b));
+ }
+
+ @Test
+ @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_D, "1", IRNode.MAX_D, "1" })
+ public double doubleMinMax(double a, double b) {
+ return Math.min(a, Math.max(a, b));
+ }
+
+ @Test
+ @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_D, "1", IRNode.MAX_D, "1" })
+ public double doubleMaxMin(double a, double b) {
+ return Math.max(a, Math.min(a, b));
+ }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestPadding.java b/test/hotspot/jtreg/compiler/c2/irTests/TestPadding.java
index 17b2817a9a2..6e7500eabc8 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestPadding.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestPadding.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/irTests/TestSpecialCasesOf_AMinusB_Plus_CMinusD_InAddIdeal.java b/test/hotspot/jtreg/compiler/c2/irTests/TestSpecialCasesOf_AMinusB_Plus_CMinusD_InAddIdeal.java
index 3728caa0b6b..22dfb50cab7 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestSpecialCasesOf_AMinusB_Plus_CMinusD_InAddIdeal.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestSpecialCasesOf_AMinusB_Plus_CMinusD_InAddIdeal.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/irTests/TestTestRemovalPeephole.java b/test/hotspot/jtreg/compiler/c2/irTests/TestTestRemovalPeephole.java
index 958c59a259c..084321ac8a4 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestTestRemovalPeephole.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestTestRemovalPeephole.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeURShiftSubword.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeURShiftSubword.java
index 9896a8b906e..46305f4d9e0 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeURShiftSubword.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeURShiftSubword.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2022, Arm Limited. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/irTests/UDivINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/UDivINodeIdealizationTests.java
new file mode 100644
index 00000000000..7183e0b311a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/UDivINodeIdealizationTests.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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 jdk.test.lib.Utils;
+
+import java.util.Random;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8332268
+ * @summary Test that Ideal transformations of UDivINode* are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.UDivINodeIdealizationTests
+ */
+public class UDivINodeIdealizationTests {
+ public static final int RANDOM_POWER_OF_2 = 1 << (1 + Utils.getRandomInstance().nextInt(30));
+
+ public static void main(String[] args) {
+ TestFramework.run();
+ }
+
+ @Run(test = {"constant", "identity", "identityAgain", "identityAgainButBig", "identityThird",
+ "retainDenominator", "divByPow2", "divByPow2Big", "divByPow2Random" })
+ public void runMethod() {
+ int a = RunInfo.getRandom().nextInt();
+ a = (a == 0) ? 1 : a;
+ int b = RunInfo.getRandom().nextInt();
+ b = (b == 0) ? 1 : b;
+
+ int min = Integer.MIN_VALUE;
+ int max = Integer.MAX_VALUE;
+
+ assertResult(0, 0, true);
+ assertResult(a, b, false);
+ assertResult(min, min, false);
+ assertResult(max, max, false);
+ }
+
+ @DontCompile
+ public void assertResult(int a, int b, boolean shouldThrow) {
+ try {
+ Asserts.assertEQ(Integer.divideUnsigned(a, a), constant(a));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ try {
+ Asserts.assertEQ(Integer.divideUnsigned(a, Integer.divideUnsigned(b, b)), identityThird(a, b));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ try {
+ Asserts.assertEQ(Integer.divideUnsigned((a * b), b), retainDenominator(a, b));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ Asserts.assertEQ(Integer.divideUnsigned(a, 1), identity(a));
+ Asserts.assertEQ(Integer.divideUnsigned(a, Integer.divideUnsigned(13, 13)), identityAgain(a));
+ Asserts.assertEQ(Integer.divideUnsigned(a, 8), divByPow2(a), "divByPow2 " + a);
+ Asserts.assertEQ(Integer.divideUnsigned(a, Integer.MIN_VALUE), divByPow2Big(a));
+ Asserts.assertEQ(Integer.divideUnsigned(a, Integer.divideUnsigned((1 << 20) + 1, (1 << 20) + 1)), identityAgainButBig(a));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.DIV_BY_ZERO_TRAP, "1"})
+ // Checks x / x => 1
+ public int constant(int x) {
+ return Integer.divideUnsigned(x, x);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ // Checks x / 1 => x
+ public int identity(int x) {
+ return Integer.divideUnsigned(x, 1);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ // Checks x / (c / c) => x
+ public int identityAgain(int x) {
+ return Integer.divideUnsigned(x, Integer.divideUnsigned(13, 13));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ // Checks x / (c / c) => x
+ public int identityAgainButBig(int x) {
+ // (1 << 20) + 1 is an arbitrary integer that cannot be optimized by the power of 2 optimizations
+ return Integer.divideUnsigned(x, Integer.divideUnsigned((1 << 20) + 1, (1 << 20) + 1));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.DIV_BY_ZERO_TRAP, "1"})
+ // Checks x / (y / y) => x
+ public int identityThird(int x, int y) {
+ return Integer.divideUnsigned(x, Integer.divideUnsigned(y, y));
+ }
+
+ @Test
+ @IR(counts = {IRNode.MUL, "1",
+ IRNode.UDIV_I, "1",
+ IRNode.DIV_BY_ZERO_TRAP, "1"
+ })
+ public int retainDenominator(int x, int y) {
+ return Integer.divideUnsigned((x * y), y);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.URSHIFT, "1"})
+ // Dividing an unsigned number by 8 is a trivial right shift by 3
+ public int divByPow2(int x) {
+ return Integer.divideUnsigned(x, 8);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.URSHIFT, "1"})
+ public int divByPow2Random(int x) {
+ return Integer.divideUnsigned(x, RANDOM_POWER_OF_2);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.URSHIFT, "1"})
+ public int divByPow2Big(int x) {
+ return Integer.divideUnsigned(x, Integer.MIN_VALUE);
+ }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/UDivLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/UDivLNodeIdealizationTests.java
new file mode 100644
index 00000000000..a5cfc2cddc5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/UDivLNodeIdealizationTests.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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 jdk.test.lib.Utils;
+
+import java.util.Random;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8332268
+ * @summary Test that Ideal transformations of UDivLNode* are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.UDivLNodeIdealizationTests
+ */
+public class UDivLNodeIdealizationTests {
+ public static final long RANDOM_POWER_OF_2 = 1L << (1 + Utils.getRandomInstance().nextInt(62));
+
+ public static void main(String[] args) {
+ TestFramework.run();
+ }
+
+ @Run(test = {"constant", "identity", "identityAgain", "identityAgainButBig", "identityThird",
+ "retainDenominator", "divByPow2", "divByPow2Big", "divByPow2Random"})
+ public void runMethod() {
+ long a = RunInfo.getRandom().nextLong();
+ a = (a == 0) ? 1 : a;
+ long b = RunInfo.getRandom().nextLong();
+ b = (b == 0) ? 1 : b;
+
+ long min = Long.MIN_VALUE;
+ long max = Long.MAX_VALUE;
+
+ assertResult(0, 0, true);
+ assertResult(a, b, false);
+ assertResult(min, min, false);
+ assertResult(max, max, false);
+ }
+
+ @DontCompile
+ public void assertResult(long a, long b, boolean shouldThrow) {
+ try {
+ Asserts.assertEQ(Long.divideUnsigned(a, a), constant(a));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ try {
+ Asserts.assertEQ(Long.divideUnsigned((a * b), b), retainDenominator(a, b));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ try {
+ Asserts.assertEQ(Long.divideUnsigned(a, Long.divideUnsigned(b, b)), identityThird(a, b));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ Asserts.assertEQ(Long.divideUnsigned(a, 1), identity(a));
+ Asserts.assertEQ(Long.divideUnsigned(a, Long.divideUnsigned(13, 13)), identityAgain(a));
+ Asserts.assertEQ(Long.divideUnsigned(a, 8), divByPow2(a));
+ Asserts.assertEQ(Long.divideUnsigned(a, Long.MIN_VALUE), divByPow2Big(a));
+ Asserts.assertEQ(Long.divideUnsigned(a, RANDOM_POWER_OF_2), divByPow2Random(a));
+ Asserts.assertEQ(Long.divideUnsigned(a, Long.divideUnsigned((1L << 40) + 1, (1L << 40) + 1)), identityAgainButBig(a));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.DIV_BY_ZERO_TRAP, "1"})
+ // Checks x / x => 1
+ public long constant(long x) {
+ return Long.divideUnsigned(x, x);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ // Checks x / 1 => x
+ public long identity(long x) {
+ return Long.divideUnsigned(x, 1L);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ // Checks x / (c / c) => x
+ public long identityAgain(long x) {
+ return Long.divideUnsigned(x, Long.divideUnsigned(13L, 13L));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ // Checks x / (c / c) => x
+ public long identityAgainButBig(long x) {
+ // (1L << 40) + 1 is an arbitrary integer that cannot be optimized by the power of 2 optimizations
+ return Long.divideUnsigned(x, Long.divideUnsigned((1L << 40) + 1, (1L << 40) + 1));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.DIV_BY_ZERO_TRAP, "1"})
+ // Checks x / (y / y) => x
+ public long identityThird(long x, long y) {
+ return Long.divideUnsigned(x, Long.divideUnsigned(y, y));
+ }
+
+ @Test
+ @IR(counts = {IRNode.MUL_L, "1",
+ IRNode.UDIV_L, "1",
+ IRNode.DIV_BY_ZERO_TRAP, "1"
+ })
+ public long retainDenominator(long x, long y) {
+ return Long.divideUnsigned((x * y), y);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.URSHIFT, "1"})
+ // Dividing an unsigned number by 8 is a trivial right shift by 3
+ public long divByPow2(long x) {
+ return Long.divideUnsigned(x, 8L);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.URSHIFT, "1"})
+ public long divByPow2Random(long x) {
+ return Long.divideUnsigned(x, RANDOM_POWER_OF_2);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UDIV})
+ @IR(counts = {IRNode.URSHIFT, "1"})
+ public long divByPow2Big(long x) {
+ return Long.divideUnsigned(x, Long.MIN_VALUE);
+ }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/UModINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/UModINodeIdealizationTests.java
new file mode 100644
index 00000000000..fa24033ab46
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/UModINodeIdealizationTests.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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 jdk.test.lib.Utils;
+
+import java.util.Random;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8332268
+ * @summary Test that Ideal transformations of UModINode* are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.UModINodeIdealizationTests
+ */
+public class UModINodeIdealizationTests {
+ public static final int RANDOM_POWER_OF_2 = 1 << (1 + Utils.getRandomInstance().nextInt(30));
+
+ public static void main(String[] args) {
+ TestFramework.run();
+ }
+
+ @Run(test = {"constant", "constantAgain", "powerOf2", "powerOf2Big", "powerOf2Random", "reallyConstant"})
+ public void runMethod() {
+ int a = RunInfo.getRandom().nextInt();
+ a = (a == 0) ? 2 : a;
+ int b = RunInfo.getRandom().nextInt();
+ b = (b == 0) ? 2 : b;
+
+ int min = Integer.MIN_VALUE;
+ int max = Integer.MAX_VALUE;
+
+ assertResult(0, 0, true);
+ assertResult(a, b, false);
+ assertResult(min, min, false);
+ assertResult(max, max, false);
+ }
+
+ @DontCompile
+ public void assertResult(int a, int b, boolean shouldThrow) {
+ try {
+ Asserts.assertEQ(Integer.remainderUnsigned(a, a), constant(a));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ Asserts.assertEQ(Integer.remainderUnsigned(a, 1), constantAgain(a));
+ Asserts.assertEQ(Integer.remainderUnsigned(a, 32), powerOf2(a));
+ Asserts.assertEQ(Integer.remainderUnsigned(a, Integer.MIN_VALUE), powerOf2Big(a));
+ Asserts.assertEQ(Integer.remainderUnsigned(a, RANDOM_POWER_OF_2), powerOf2Random(a));
+ Asserts.assertEQ(Integer.remainderUnsigned(Integer.MIN_VALUE, 302032), reallyConstant());
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_I, IRNode.MUL})
+ @IR(counts = {IRNode.DIV_BY_ZERO_TRAP, "1"})
+ // Checks x % x => 0
+ public int constant(int x) {
+ return Integer.remainderUnsigned(x, x);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_I})
+ // Checks x % 1 => 0
+ public int constantAgain(int x) {
+ return Integer.remainderUnsigned(x, 1);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_I, IRNode.MUL})
+ // Checks that modulo with two constants is calculated at compile time
+ public int reallyConstant() {
+ return Integer.remainderUnsigned(Integer.MIN_VALUE, 302032); // -2147483648 = Integer.parseUnsignedInt("2147483648")
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_I, IRNode.MUL})
+ @IR(counts = {IRNode.AND, "1"})
+ // Checks that for x % 2^k, 2^k-1 is used as a bit mask.
+ public int powerOf2(int x) {
+ return Integer.remainderUnsigned(x, 32);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_I, IRNode.MUL})
+ @IR(counts = {IRNode.AND, "1"})
+ // Checks that for x % 2^k, 2^k-1 is used as a bit mask.
+ public int powerOf2Random(int x) {
+ return Integer.remainderUnsigned(x, RANDOM_POWER_OF_2);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_I, IRNode.MUL})
+ @IR(counts = {IRNode.AND, "1"})
+ // Checks that for x % 2^k, 2^k-1 is used as a bit mask.
+ public int powerOf2Big(int x) {
+ return Integer.remainderUnsigned(x, Integer.MIN_VALUE);
+ }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/UModLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/UModLNodeIdealizationTests.java
new file mode 100644
index 00000000000..93ae861cfaa
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/UModLNodeIdealizationTests.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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 jdk.test.lib.Utils;
+
+import java.util.Random;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8332268
+ * @summary Test that Ideal transformations of UModLNode* are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.UModLNodeIdealizationTests
+ */
+public class UModLNodeIdealizationTests {
+ public static final long RANDOM_POWER_OF_2 = 1L << (1 + Utils.getRandomInstance().nextInt(62));
+
+ public static void main(String[] args) {
+ TestFramework.run();
+ }
+
+ @Run(test = {"constant", "constantAgain", "powerOf2", "powerOf2Big", "powerOf2Random", "reallyConstant"})
+ public void runMethod() {
+ long a = RunInfo.getRandom().nextInt();
+ a = (a == 0) ? 2 : a;
+ long b = RunInfo.getRandom().nextInt();
+ b = (b == 0) ? 2 : b;
+
+ long min = Long.MIN_VALUE;
+ long max = Long.MAX_VALUE;
+
+ assertResult(0, 0, true);
+ assertResult(a, b, false);
+ assertResult(min, min, false);
+ assertResult(max, max, false);
+ }
+
+ @DontCompile
+ public void assertResult(long a, long b, boolean shouldThrow) {
+ try {
+ Asserts.assertEQ(Long.remainderUnsigned(a, a), constant(a));
+ Asserts.assertFalse(shouldThrow, "Expected an exception to be thrown.");
+ } catch (ArithmeticException e) {
+ Asserts.assertTrue(shouldThrow, "Did not expect an exception to be thrown.");
+ }
+
+ Asserts.assertEQ(Long.remainderUnsigned(a, 1), constantAgain(a));
+ Asserts.assertEQ(Long.remainderUnsigned(a, 1L << 33), powerOf2(a));
+ Asserts.assertEQ(Long.remainderUnsigned(Long.MIN_VALUE, 302032), reallyConstant());
+ Asserts.assertEQ(Long.remainderUnsigned(a, Long.MIN_VALUE), powerOf2Big(a));
+ Asserts.assertEQ(Long.remainderUnsigned(a, RANDOM_POWER_OF_2), powerOf2Random(a));
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_L, IRNode.MUL})
+ @IR(counts = {IRNode.DIV_BY_ZERO_TRAP, "1"})
+ // Checks x % x => 0
+ public long constant(long x) {
+ return Long.remainderUnsigned(x, x);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_L})
+ // Checks x % 1 => 0
+ public long constantAgain(long x) {
+ return Long.remainderUnsigned(x, 1);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_L, IRNode.MUL})
+ // Checks that modulo with two constants is calculated at compile time
+ public long reallyConstant() {
+ return Long.remainderUnsigned(Long.MIN_VALUE, 302032);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_L, IRNode.MUL})
+ @IR(counts = {IRNode.AND, "1"})
+ // Checks that for x % 2^k, 2^k-1 is used as a bit mask.
+ public long powerOf2(long x) {
+ return Long.remainderUnsigned(x, 1L << 33);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_L, IRNode.MUL})
+ @IR(counts = {IRNode.AND, "1"})
+ // Checks that for x % 2^k, 2^k-1 is used as a bit mask.
+ public long powerOf2Random(long x) {
+ return Long.remainderUnsigned(x, RANDOM_POWER_OF_2);
+ }
+
+ @Test
+ @IR(failOn = {IRNode.UMOD_L, IRNode.MUL})
+ @IR(counts = {IRNode.AND, "1"})
+ // Checks that for x % 2^k, 2^k-1 is used as a bit mask.
+ public long powerOf2Big(long x) {
+ return Long.remainderUnsigned(x, Long.MIN_VALUE);
+ }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/igvn/TestIntegerMulRing.java b/test/hotspot/jtreg/compiler/c2/irTests/igvn/TestIntegerMulRing.java
index bd7600d5503..2f0281825be 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/igvn/TestIntegerMulRing.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/igvn/TestIntegerMulRing.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/ScalarReplacementTests.java b/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/ScalarReplacementTests.java
index 1c332ac976b..d1fec57144f 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/ScalarReplacementTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/ScalarReplacementTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java b/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java
index 6f173fefe1e..53865d34898 100644
--- a/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java
+++ b/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java b/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java
index 1b72399069e..b2074d49052 100644
--- a/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java
+++ b/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java b/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java
index 87ce9a313a8..6008b6bb593 100644
--- a/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java
+++ b/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/compilercontrol/commands/MemLimitTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/MemLimitTest.java
index a6e16a317b0..559c0fcce02 100644
--- a/test/hotspot/jtreg/compiler/compilercontrol/commands/MemLimitTest.java
+++ b/test/hotspot/jtreg/compiler/compilercontrol/commands/MemLimitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright Red Hat, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/compiler/compilercontrol/commands/MemStatTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/MemStatTest.java
index e54ce7592e1..a8d67ff58b4 100644
--- a/test/hotspot/jtreg/compiler/compilercontrol/commands/MemStatTest.java
+++ b/test/hotspot/jtreg/compiler/compilercontrol/commands/MemStatTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
index 7e9878f32b2..d00b0a57b36 100644
--- a/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
+++ b/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/compiler/compilercontrol/parser/HugeDirectiveUtil.java b/test/hotspot/jtreg/compiler/compilercontrol/parser/HugeDirectiveUtil.java
index d337266dd50..7a9a00b300d 100644
--- a/test/hotspot/jtreg/compiler/compilercontrol/parser/HugeDirectiveUtil.java
+++ b/test/hotspot/jtreg/compiler/compilercontrol/parser/HugeDirectiveUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
index ac3a6d9a8c6..b710ebcd283 100644
--- a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
+++ b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
index fdc8f63f9e0..26ad906095f 100644
--- a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
+++ b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/gcbarriers/TestArrayCopyWithLargeObjectAlignment.java b/test/hotspot/jtreg/compiler/gcbarriers/TestArrayCopyWithLargeObjectAlignment.java
index 494c571450d..812372d1645 100644
--- a/test/hotspot/jtreg/compiler/gcbarriers/TestArrayCopyWithLargeObjectAlignment.java
+++ b/test/hotspot/jtreg/compiler/gcbarriers/TestArrayCopyWithLargeObjectAlignment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java b/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java
index 3678691b218..e59c2d6c161 100644
--- a/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java
+++ b/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java b/test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java
index 8f87a5d1a14..633efb63478 100644
--- a/test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java
+++ b/test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
index 65901f5e656..7542f0cd237 100644
--- a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
+++ b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/intrinsics/TestBitShuffleOpers.java b/test/hotspot/jtreg/compiler/intrinsics/TestBitShuffleOpers.java
index e94d7bcc95b..d2d707d6efb 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/TestBitShuffleOpers.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/TestBitShuffleOpers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/intrinsics/chacha/TestChaCha20.java b/test/hotspot/jtreg/compiler/intrinsics/chacha/TestChaCha20.java
index d2f287e8bcc..607c71d62ee 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/chacha/TestChaCha20.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/chacha/TestChaCha20.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2021, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16Conversion.java b/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16Conversion.java
index 4fb04f0be45..60eb23bc7c5 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16Conversion.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16Conversion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16ConversionNaN.java b/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16ConversionNaN.java
index b80e8fecc9f..ee896f1a1bc 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16ConversionNaN.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16ConversionNaN.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/intrinsics/float16/TestAllFloat16ToFloat.java b/test/hotspot/jtreg/compiler/intrinsics/float16/TestAllFloat16ToFloat.java
index a6a13617d80..081ee647475 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/float16/TestAllFloat16ToFloat.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/float16/TestAllFloat16ToFloat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/intrinsics/float16/TestConstFloat16ToFloat.java b/test/hotspot/jtreg/compiler/intrinsics/float16/TestConstFloat16ToFloat.java
index ce91107ed74..d7466afe9f5 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/float16/TestConstFloat16ToFloat.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/float16/TestConstFloat16ToFloat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/TestEnableJVMCIProduct.java b/test/hotspot/jtreg/compiler/jvmci/TestEnableJVMCIProduct.java
index 16f9345c2ee..ed3e0920bf4 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestEnableJVMCIProduct.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestEnableJVMCIProduct.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/TestInvalidJVMCIOption.java b/test/hotspot/jtreg/compiler/jvmci/TestInvalidJVMCIOption.java
index 77d5e7e91fa..0758fd24df0 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestInvalidJVMCIOption.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestInvalidJVMCIOption.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
index d6de659eea4..e58bc4df169 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/TestJVMCISavedProperties.java b/test/hotspot/jtreg/compiler/jvmci/TestJVMCISavedProperties.java
index 0bddce28325..6d0f87fa0f5 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestJVMCISavedProperties.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestJVMCISavedProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
index 6e1a8221a73..4285000e27f 100644
--- a/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
+++ b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
index 2a222c0a0ec..44c9b9e7f57 100644
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
index 1dcef0c96cd..6830769b652 100644
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
index 97583b45458..dc68dd3d8d9 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
index 82058ec02cf..c9c88024d99 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
index e77ac8dc4f9..b27a5038ff5 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
index 6a4f6addd0d..4d953cac898 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
index 12664bd433f..db30229d34f 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
index 8d6814c5435..89136091b54 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
index 32b0e66df33..10b24109d3b 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
index 98d7d168ba7..75f074ad09d 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
@@ -32,7 +32,6 @@
* @clean jdk.internal.vm.test.AnnotationTestInput$Missing
* @compile ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberDeleted.java
* ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberTypeChanged.java
- * @enablePreview
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* jdk.internal.vm.ci/jdk.vm.ci.common
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
index 1418248b68c..bd2bc6f52f0 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
index 13003095ee6..28ba77fa6b0 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/Arguments.java b/test/hotspot/jtreg/compiler/lib/ir_framework/Arguments.java
index 90e57f27c32..47db2946f49 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/Arguments.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/Arguments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 0ed73f49426..3fa8201d186 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -572,6 +572,11 @@ public class IRNode {
beforeMatchingNameRegex(DIV, "Div(I|L|F|D)");
}
+ public static final String UDIV = PREFIX + "UDIV" + POSTFIX;
+ static {
+ beforeMatchingNameRegex(UDIV, "UDiv(I|L|F|D)");
+ }
+
public static final String DIV_BY_ZERO_TRAP = PREFIX + "DIV_BY_ZERO_TRAP" + POSTFIX;
static {
trapNodes(DIV_BY_ZERO_TRAP, "div0_check");
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/Test.java b/test/hotspot/jtreg/compiler/lib/ir_framework/Test.java
index 39cbd9c9eef..49b297f6b93 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/Test.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java
index cb362b3bbfb..0b7d1db125c 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
index d1741277b43..9d1bf62746f 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/test/ArgumentValue.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/ArgumentValue.java
index 836f37f6656..d5a10c37b5d 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/ArgumentValue.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/ArgumentValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/test/BaseTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/BaseTest.java
index ee36f13fc7d..8b693ddcf17 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/BaseTest.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/BaseTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/test/DeclaredTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/DeclaredTest.java
index 91cf6f8c27a..d065a04b026 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/DeclaredTest.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/DeclaredTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index cd524622f4e..9f58f709702 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
index 161dc664551..f98767e329f 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/TestRangeCheckPredicatesControl.java b/test/hotspot/jtreg/compiler/loopopts/TestRangeCheckPredicatesControl.java
index 1f64ed28d8a..8d2223f482a 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestRangeCheckPredicatesControl.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestRangeCheckPredicatesControl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/UseCountedLoopSafepointsTest.java b/test/hotspot/jtreg/compiler/loopopts/UseCountedLoopSafepointsTest.java
index effbbbe46bd..2a9cedfc87e 100644
--- a/test/hotspot/jtreg/compiler/loopopts/UseCountedLoopSafepointsTest.java
+++ b/test/hotspot/jtreg/compiler/loopopts/UseCountedLoopSafepointsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/CoLocatePackMemoryState.java b/test/hotspot/jtreg/compiler/loopopts/superword/CoLocatePackMemoryState.java
index c60144da0cd..8441a1504e0 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/CoLocatePackMemoryState.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/CoLocatePackMemoryState.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_long.java b/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_long.java
index ee691a91bda..b840d1914b2 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_long.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_long.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java b/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
index 591765bb582..56acdd349f8 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/TestCyclicDependency.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestCyclicDependency.java
index 7c6b7c92c37..74152645a48 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestCyclicDependency.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestCyclicDependency.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
index 9edd9d28dd8..363ceeb28f6 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency2.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency2.java
index 2be7d52c780..2f64cc1611f 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency2.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/TestPeeledReductionNode.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestPeeledReductionNode.java
index b69bff04088..a8727bf52da 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestPeeledReductionNode.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestPeeledReductionNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/TestPickFirstMemoryState.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestPickFirstMemoryState.java
index 5d419766aeb..99526ff1d46 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestPickFirstMemoryState.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestPickFirstMemoryState.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/TestPickLastMemoryState.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestPickLastMemoryState.java
index bbdf4d3ad7a..db2d9dc18f5 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestPickLastMemoryState.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestPickLastMemoryState.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, Arm Limited. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
index 0512442c896..338e0dea59d 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReduction.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReduction.java
index eed03b3a4a1..4125f12e8df 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReduction.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReduction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/loopopts/superword/Vec_MulAddS2I.java b/test/hotspot/jtreg/compiler/loopopts/superword/Vec_MulAddS2I.java
index d595e914ff4..4345627c196 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/Vec_MulAddS2I.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/Vec_MulAddS2I.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/oracle/PrintIdealPhaseTest.java b/test/hotspot/jtreg/compiler/oracle/PrintIdealPhaseTest.java
index d87f68efeee..fb9fd8a28fa 100644
--- a/test/hotspot/jtreg/compiler/oracle/PrintIdealPhaseTest.java
+++ b/test/hotspot/jtreg/compiler/oracle/PrintIdealPhaseTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/oracle/TestInvalidCompileCommand.java b/test/hotspot/jtreg/compiler/oracle/TestInvalidCompileCommand.java
index a20a9359111..791b1d042e3 100644
--- a/test/hotspot/jtreg/compiler/oracle/TestInvalidCompileCommand.java
+++ b/test/hotspot/jtreg/compiler/oracle/TestInvalidCompileCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestTemplateAssertionPredicateNotRemoved.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestTemplateAssertionPredicateNotRemoved.java
index 6d8588213b5..9048209614a 100644
--- a/test/hotspot/jtreg/compiler/predicates/assertion/TestTemplateAssertionPredicateNotRemoved.java
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestTemplateAssertionPredicateNotRemoved.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/print/CompileCommandPrintCompilation.java b/test/hotspot/jtreg/compiler/print/CompileCommandPrintCompilation.java
index 358a5a0a6b3..4a54417fbd7 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandPrintCompilation.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandPrintCompilation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/print/PrintCompilation.java b/test/hotspot/jtreg/compiler/print/PrintCompilation.java
index 3b3db304cef..9d489556e01 100644
--- a/test/hotspot/jtreg/compiler/print/PrintCompilation.java
+++ b/test/hotspot/jtreg/compiler/print/PrintCompilation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/profiling/TestMethodHandleInvokesIntrinsic.java b/test/hotspot/jtreg/compiler/profiling/TestMethodHandleInvokesIntrinsic.java
index 9ca1c13f03a..c5ec6264952 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestMethodHandleInvokesIntrinsic.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestMethodHandleInvokesIntrinsic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8041458
* @summary profiling of arguments in C1 at MethodHandle invoke of intrinsic tries to profile popped argument.
*
+ * @requires vm.compMode != "Xcomp"
* @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
* -XX:TieredStopAtLevel=3
* compiler.profiling.TestMethodHandleInvokesIntrinsic
diff --git a/test/hotspot/jtreg/compiler/profiling/TestMultiBranchDataOverflow.java b/test/hotspot/jtreg/compiler/profiling/TestMultiBranchDataOverflow.java
index 323cf213727..8d84fc4df38 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestMultiBranchDataOverflow.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestMultiBranchDataOverflow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @test
* @bug 8251458
* @summary Test int range overflow of MultiBranchData counter.
+ * @requires vm.compMode != "Xcomp"
* @run main/othervm -XX:CompileCommand=dontinline,compiler.profiling.TestMultiBranchDataOverflow::test
* -Xbatch -XX:Tier4BackEdgeThreshold=2147483647
* compiler.profiling.TestMultiBranchDataOverflow
diff --git a/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java b/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java
index a904192997e..b4c4d2d4a4a 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, Loongson Technology Co. Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -25,6 +26,7 @@
* @test
* @bug 8224162
* @summary Profile counter for a call site may overflow.
+ * @requires vm.compMode != "Xcomp"
* @run main/othervm -Xbatch -XX:-UseOnStackReplacement -XX:+IgnoreUnrecognizedVMOptions -XX:MaxTrivialSize=0 -XX:C1MaxTrivialSize=0 compiler.profiling.TestProfileCounterOverflow
*/
diff --git a/test/hotspot/jtreg/compiler/profiling/TestSharedHeadExceptionBackedges.java b/test/hotspot/jtreg/compiler/profiling/TestSharedHeadExceptionBackedges.java
index e02df36fa1c..b3c95fa302b 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestSharedHeadExceptionBackedges.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestSharedHeadExceptionBackedges.java
@@ -25,6 +25,7 @@
* @test
* bug 8280842
* @summary Access violation in ciTypeFlow::profiled_count
+ * @requires vm.compMode != "Xcomp"
* @run main/othervm -XX:-BackgroundCompilation TestSharedHeadExceptionBackedges
*/
diff --git a/test/hotspot/jtreg/compiler/profiling/TestSpecTrapClassUnloading.java b/test/hotspot/jtreg/compiler/profiling/TestSpecTrapClassUnloading.java
index d713bf4d340..3f01d9ef2b6 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestSpecTrapClassUnloading.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestSpecTrapClassUnloading.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8031752
* @summary speculative traps need to be cleaned up at GC
*
+ * @requires vm.compMode != "Xcomp"
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation
* -XX:-UseOnStackReplacement -XX:-BackgroundCompilation
* -XX:CompileThreshold=10000
diff --git a/test/hotspot/jtreg/compiler/profiling/TestTypeProfileArgsLimit.java b/test/hotspot/jtreg/compiler/profiling/TestTypeProfileArgsLimit.java
index a6d5da5a409..35804895307 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestTypeProfileArgsLimit.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestTypeProfileArgsLimit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8295406
* @summary Tests execution with TypeProfileArgsLimit=0 TypeProfileLevel=222.
*
+ * @requires vm.compMode != "Xcomp"
* @run main/othervm -XX:TypeProfileArgsLimit=0 -XX:TypeProfileLevel=222 compiler.profiling.TestTypeProfileArgsLimit
* @run main/othervm -XX:TypeProfileArgsLimit=0 -XX:TypeProfileLevel=212 compiler.profiling.TestTypeProfileArgsLimit
* @run main/othervm -XX:TypeProfileArgsLimit=0 -XX:TypeProfileLevel=202 compiler.profiling.TestTypeProfileArgsLimit
diff --git a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
index d5f5926bac0..849bc17ca95 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,7 @@
*
* @comment the test can't be run w/ TieredStopAtLevel < 4
* @requires vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4
+ * @requires vm.compMode != "Xcomp"
*
* @library /test/lib /
* @build jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/compiler/profiling/TestUnexpectedProfilingMismatch.java b/test/hotspot/jtreg/compiler/profiling/TestUnexpectedProfilingMismatch.java
index c0df67a1709..3bbf0a445e5 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestUnexpectedProfilingMismatch.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestUnexpectedProfilingMismatch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8027631
* @summary profiling of arguments at calls cannot rely on signature of callee for types
*
+ * @requires vm.compMode != "Xcomp"
* @run main/othervm -XX:-BackgroundCompilation -XX:TieredStopAtLevel=3 -XX:TypeProfileLevel=111
* -XX:Tier3InvocationThreshold=200 -XX:Tier0InvokeNotifyFreqLog=7
* compiler.profiling.TestUnexpectedProfilingMismatch
diff --git a/test/hotspot/jtreg/compiler/profiling/UnsafeAccess.java b/test/hotspot/jtreg/compiler/profiling/UnsafeAccess.java
index b7b91e8615b..ef09de8d63b 100644
--- a/test/hotspot/jtreg/compiler/profiling/UnsafeAccess.java
+++ b/test/hotspot/jtreg/compiler/profiling/UnsafeAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
* @bug 8134918
* @modules java.base/jdk.internal.misc
*
+ * @requires vm.compMode != "Xcomp"
* @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation -Xbatch
* -XX:CompileCommand=dontinline,compiler.profiling.UnsafeAccess::test*
* compiler.profiling.UnsafeAccess
diff --git a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java
index 1a8ed4c7893..bdf4b3fb852 100644
--- a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java
+++ b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java
@@ -28,6 +28,7 @@
* @modules java.base/jdk.internal.misc
* java.instrument
* @requires vm.jvmti & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ * @requires vm.compMode != "Xcomp"
* @build compiler.profiling.spectrapredefineclass.Agent
* @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.profiling.spectrapredefineclass.Agent
* @run driver compiler.profiling.spectrapredefineclass.Launcher
diff --git a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java
index 08765e911c0..6fdbca00523 100644
--- a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java
+++ b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java
@@ -28,6 +28,7 @@
* @modules java.base/jdk.internal.misc
* java.instrument
* @requires vm.jvmti & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ * @requires vm.compMode != "Xcomp"
* @build compiler.profiling.spectrapredefineclass_classloaders.Agent
* compiler.profiling.spectrapredefineclass_classloaders.Test
* compiler.profiling.spectrapredefineclass_classloaders.A
diff --git a/test/hotspot/jtreg/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java b/test/hotspot/jtreg/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java
index d68f5c012d0..daebd57c457 100644
--- a/test/hotspot/jtreg/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java
+++ b/test/hotspot/jtreg/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary class unloading resets profile, method compiled after the profile is
* first set and before class loading sets unknown bit with not recorded class
* @library /
+ * @requires vm.compMode != "Xcomp"
* @build compiler.profiling.unloadingconflict.B
* @run main/othervm -XX:TypeProfileLevel=222 -XX:-BackgroundCompilation
* compiler.profiling.unloadingconflict.TestProfileConflictClassUnloading
diff --git a/test/hotspot/jtreg/compiler/rangechecks/TestExplicitRangeChecks.java b/test/hotspot/jtreg/compiler/rangechecks/TestExplicitRangeChecks.java
index 83bfd63c629..d74a10ae02c 100644
--- a/test/hotspot/jtreg/compiler/rangechecks/TestExplicitRangeChecks.java
+++ b/test/hotspot/jtreg/compiler/rangechecks/TestExplicitRangeChecks.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java b/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java
index 3daf12df879..46a34f64c09 100644
--- a/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java
+++ b/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/splitif/TestSplitDivisionThroughPhi.java b/test/hotspot/jtreg/compiler/splitif/TestSplitDivisionThroughPhi.java
index e95c74616a1..adb5b5d44c7 100644
--- a/test/hotspot/jtreg/compiler/splitif/TestSplitDivisionThroughPhi.java
+++ b/test/hotspot/jtreg/compiler/splitif/TestSplitDivisionThroughPhi.java
@@ -74,6 +74,9 @@ public class TestSplitDivisionThroughPhi {
public static void main(String[] strArr) {
+ // Make sure classes are loaded when compiling with -Xcomp
+ Integer.divideUnsigned(2, 3);
+ Long.divideUnsigned(2, 3);
for (int i = 0; i < 5000; i++) {
testPushDivIThruPhi();
testPushDivIThruPhiInChain();
@@ -85,6 +88,16 @@ public static void main(String[] strArr) {
testPushModLThruPhiInChain();
testPushDivLThruPhiForOuterLongLoop();
testPushModLThruPhiForOuterLongLoop();
+ testPushUDivLThruPhiForOuterLongLoop();
+ testPushUModLThruPhiForOuterLongLoop();
+ testPushUDivIThruPhi();
+ testPushUDivIThruPhiInChain();
+ testPushUModIThruPhi();
+ testPushUModIThruPhiInChain();
+ testPushUDivLThruPhi();
+ testPushUDivLThruPhiInChain();
+ testPushUModLThruPhi();
+ testPushUModLThruPhiInChain();
}
}
@@ -202,4 +215,114 @@ static void testPushModLThruPhiInChain() {
}
}
}
+
+ // Same as above but with UDivI.
+ static void testPushUDivIThruPhi() {
+ for (int i = 10; i > 1; i -= 2) {
+ lFld = Integer.divideUnsigned(10, i);
+
+ // Loop that is not removed such that we do not transform the outer LongCountedLoop (only done if innermost)
+ for (int j = 0; j < 10; j++) {
+ flag = !flag;
+ }
+ }
+ }
+
+ // Same as above but with UDivI.
+ static void testPushUDivIThruPhiInChain() {
+ for (int i = 10; i > 1; i -= 2) {
+ for (int j = 0; j < 1; j++) {
+ }
+ lFld = Integer.divideUnsigned(10, (i * 100));
+
+ for (int j = 0; j < 10; j++) {
+ flag = !flag;
+ }
+ }
+ }
+
+ // Same as above but with UModI
+ static void testPushUModIThruPhi() {
+ for (int i = 10; i > 1; i -= 2) {
+ lFld = Integer.remainderUnsigned(10, i);
+
+ for (int j = 0; j < 10; j++) {
+ flag = !flag;
+ }
+ }
+ }
+
+ // Same as above but with UModI
+ static void testPushUModIThruPhiInChain() {
+ for (int i = 10; i > 1; i -= 2) {
+ for (int j = 0; j < 1; j++) {
+ }
+ lFld = Integer.remainderUnsigned(10, (i * 100));
+
+ for (int j = 0; j < 10; j++) {
+ flag = !flag;
+ }
+ }
+ }
+
+ // Same as above but with UDivL.
+ static void testPushUDivLThruPhi() {
+ for (long i = 10; i > 1; i -= 2) {
+ lFld = Long.divideUnsigned(10L, i);
+
+ // Loop that is not removed such that we do not transform the outer LongCountedLoop (only done if innermost)
+ for (int j = 0; j < 10; j++) {
+ flag = !flag;
+ }
+ }
+ }
+
+ // Same as above but with UDivL.
+ static void testPushUDivLThruPhiInChain() {
+ for (long i = 10; i > 1; i -= 2) {
+ for (int j = 0; j < 1; j++) {
+ }
+ lFld = Long.divideUnsigned(10L, (i * 100L));
+
+ for (int j = 0; j < 10; j++) {
+ flag = !flag;
+ }
+ }
+ }
+
+ // Same as above but with UModL
+ static void testPushUModLThruPhi() {
+ for (long i = 10; i > 1; i -= 2) {
+ lFld = Long.remainderUnsigned(10L, i);
+
+ for (int j = 0; j < 10; j++) {
+ flag = !flag;
+ }
+ }
+ }
+
+ // Same as above but with UModL
+ static void testPushUModLThruPhiInChain() {
+ for (long i = 10; i > 1; i -= 2) {
+ for (int j = 0; j < 1; j++) {
+ }
+ lFld = Long.remainderUnsigned(10L, (i * 100L));
+
+ for (int j = 0; j < 10; j++) {
+ flag = !flag;
+ }
+ }
+ }
+
+ static void testPushUDivLThruPhiForOuterLongLoop() {
+ for (long i = 10; i > 1; i -= 2) {
+ lFld = Long.divideUnsigned(10, i);
+ }
+ }
+
+ static void testPushUModLThruPhiForOuterLongLoop() {
+ for (int i = 10; i > 1; i -= 2) {
+ iFld = Integer.remainderUnsigned(10, i);
+ }
+ }
}
diff --git a/test/hotspot/jtreg/compiler/uncommontrap/DeoptReallocFailure.java b/test/hotspot/jtreg/compiler/uncommontrap/DeoptReallocFailure.java
index 96c79864b52..4bd7f89b59d 100644
--- a/test/hotspot/jtreg/compiler/uncommontrap/DeoptReallocFailure.java
+++ b/test/hotspot/jtreg/compiler/uncommontrap/DeoptReallocFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java b/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java
index a0a2aacde3f..3dc9df2d73e 100644
--- a/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java
+++ b/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java b/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java
index 626f4c9b1f6..05b80eab2c0 100644
--- a/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java
+++ b/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/unsafe/UnsafeGetStableArrayElement.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetStableArrayElement.java
index bef57605f5f..9d3578bd6a1 100644
--- a/test/hotspot/jtreg/compiler/unsafe/UnsafeGetStableArrayElement.java
+++ b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetStableArrayElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/vectorapi/VectorRebracket128Test.java b/test/hotspot/jtreg/compiler/vectorapi/VectorRebracket128Test.java
index 7e6a457d25e..d757228cf7f 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorRebracket128Test.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorRebracket128Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/vectorization/TestReplicateAtConv.java b/test/hotspot/jtreg/compiler/vectorization/TestReplicateAtConv.java
index e77b474bf66..74ae97cc7ee 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestReplicateAtConv.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestReplicateAtConv.java
@@ -23,9 +23,10 @@
/**
* @test
- * @bug 8341834
- * @summary C2 compilation fails with "bad AD file" due to Replicate
+ * @bug 8341834 8343747
+ * @summary Replicate node at a VectorCast (ConvL2I) causes superword to fail
* @run main/othervm -XX:CompileCommand=compileonly,TestReplicateAtConv::test -Xcomp TestReplicateAtConv
+ * @run main/othervm -XX:CompileCommand=compileonly,TestReplicateAtConv::test -Xcomp -XX:MaxVectorSize=8 TestReplicateAtConv
*/
public class TestReplicateAtConv {
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java b/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
index 71c9114121c..d16e00c97f6 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
index beb28e1fe8c..7cf4ae17cb4 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/vectorization/TestSignumVector.java b/test/hotspot/jtreg/compiler/vectorization/TestSignumVector.java
index ee4e613dbbb..133befb745a 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestSignumVector.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestSignumVector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
index 60a6d78a7d4..c3ff910b03c 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
index b3d7c215867..54f7f9a7261 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
index 2f1bfcdf1df..8a2b50ea676 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
index 50b68cd2e48..3e5097edf47 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
@@ -216,9 +216,8 @@ public short[] vectorSignedShiftRight() {
@IR(failOn = {IRNode.STORE_VECTOR})
public short[] vectorMin() {
short[] res = new short[SIZE];
- int val = 65536;
for (int i = 0; i < SIZE; i++) {
- res[i] = (short) Math.min(a[i], val);
+ res[i] = (short) Math.min(a[i], b[i]);
}
return res;
}
diff --git a/test/hotspot/jtreg/compiler/whitebox/DeoptimizeFramesTest.java b/test/hotspot/jtreg/compiler/whitebox/DeoptimizeFramesTest.java
index 91601479881..35941f018ab 100644
--- a/test/hotspot/jtreg/compiler/whitebox/DeoptimizeFramesTest.java
+++ b/test/hotspot/jtreg/compiler/whitebox/DeoptimizeFramesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/containers/cgroup/TestContainerized.java b/test/hotspot/jtreg/containers/cgroup/TestContainerized.java
index 52cf5451a8d..ab933dd74c3 100644
--- a/test/hotspot/jtreg/containers/cgroup/TestContainerized.java
+++ b/test/hotspot/jtreg/containers/cgroup/TestContainerized.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/containers/docker/EventGeneratorLoop.java b/test/hotspot/jtreg/containers/docker/EventGeneratorLoop.java
index efb1690ea75..536e972c609 100644
--- a/test/hotspot/jtreg/containers/docker/EventGeneratorLoop.java
+++ b/test/hotspot/jtreg/containers/docker/EventGeneratorLoop.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/containers/docker/JfrReporter.java b/test/hotspot/jtreg/containers/docker/JfrReporter.java
index 24692b20a62..5dda8c02ebb 100644
--- a/test/hotspot/jtreg/containers/docker/JfrReporter.java
+++ b/test/hotspot/jtreg/containers/docker/JfrReporter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestAllocHumongousFragment.java b/test/hotspot/jtreg/gc/TestAllocHumongousFragment.java
index 8d5fd780811..446cf3c27bb 100644
--- a/test/hotspot/jtreg/gc/TestAllocHumongousFragment.java
+++ b/test/hotspot/jtreg/gc/TestAllocHumongousFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018, Red Hat, Inc. All rights reserved.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/test/hotspot/jtreg/gc/TestAllocateHeapAt.java b/test/hotspot/jtreg/gc/TestAllocateHeapAt.java
index d1e96751ab8..78d841192ee 100644
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAt.java
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java b/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java
index 28e2f71d09d..9b632064c1e 100644
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java b/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
index d8d1b4bd88d..50a682deb70 100644
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestCardTablePageCommits.java b/test/hotspot/jtreg/gc/TestCardTablePageCommits.java
index 6c10dd0100e..c639eca401d 100644
--- a/test/hotspot/jtreg/gc/TestCardTablePageCommits.java
+++ b/test/hotspot/jtreg/gc/TestCardTablePageCommits.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestDisableExplicitGC.java b/test/hotspot/jtreg/gc/TestDisableExplicitGC.java
index 08fda78baaa..62d773b6e5e 100644
--- a/test/hotspot/jtreg/gc/TestDisableExplicitGC.java
+++ b/test/hotspot/jtreg/gc/TestDisableExplicitGC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestNumWorkerOutput.java b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java
index c4c0dce0c99..b07f4c11e64 100644
--- a/test/hotspot/jtreg/gc/TestNumWorkerOutput.java
+++ b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java b/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
index 8dfefcb7d95..73d3c475335 100644
--- a/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
+++ b/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestReferenceClearDuringReferenceProcessing.java b/test/hotspot/jtreg/gc/TestReferenceClearDuringReferenceProcessing.java
index 3be7ba241e7..aae71590024 100644
--- a/test/hotspot/jtreg/gc/TestReferenceClearDuringReferenceProcessing.java
+++ b/test/hotspot/jtreg/gc/TestReferenceClearDuringReferenceProcessing.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestSmallHeap.java b/test/hotspot/jtreg/gc/TestSmallHeap.java
index fd6c5860f01..717c9ebce01 100644
--- a/test/hotspot/jtreg/gc/TestSmallHeap.java
+++ b/test/hotspot/jtreg/gc/TestSmallHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestSystemGC.java b/test/hotspot/jtreg/gc/TestSystemGC.java
index 6d37dc3d44b..8fa9afc8a56 100644
--- a/test/hotspot/jtreg/gc/TestSystemGC.java
+++ b/test/hotspot/jtreg/gc/TestSystemGC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java b/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java
index e651295d5b5..5f3a141ea46 100644
--- a/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java
+++ b/test/hotspot/jtreg/gc/TestVerifyDuringStartup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestVerifySilently.java b/test/hotspot/jtreg/gc/TestVerifySilently.java
index 2f245f5eed2..c105ed5447b 100644
--- a/test/hotspot/jtreg/gc/TestVerifySilently.java
+++ b/test/hotspot/jtreg/gc/TestVerifySilently.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/TestVerifySubSet.java b/test/hotspot/jtreg/gc/TestVerifySubSet.java
index 3dc28549b56..e6206039ac0 100644
--- a/test/hotspot/jtreg/gc/TestVerifySubSet.java
+++ b/test/hotspot/jtreg/gc/TestVerifySubSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/GCArguments.java b/test/hotspot/jtreg/gc/arguments/GCArguments.java
index 3908ce17966..0170b802da4 100644
--- a/test/hotspot/jtreg/gc/arguments/GCArguments.java
+++ b/test/hotspot/jtreg/gc/arguments/GCArguments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java b/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java
index 4ed673a40fe..758747d451a 100644
--- a/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java
+++ b/test/hotspot/jtreg/gc/arguments/TestAggressiveHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java b/test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java
index c1975d6b692..b152fc8c936 100644
--- a/test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestCompressedClassFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java b/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java
index 0828622fa7a..8feb6ae993f 100644
--- a/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java
+++ b/test/hotspot/jtreg/gc/arguments/TestDisableDefaultGC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java b/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java
index c5f595e7a1a..c4018e106b7 100644
--- a/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java
+++ b/test/hotspot/jtreg/gc/arguments/TestG1ConcMarkStepDurationMillis.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java b/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java
index f82d2b31711..f0a953a844b 100644
--- a/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java
+++ b/test/hotspot/jtreg/gc/arguments/TestG1ConcRefinementThreads.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java b/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java
index 5ecd27e24e8..97b15bdc5c9 100644
--- a/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java
+++ b/test/hotspot/jtreg/gc/arguments/TestG1HeapRegionSize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java b/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java
index 48345da250a..8dfea6d2ae7 100644
--- a/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java
+++ b/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestG1RemSetFlags.java b/test/hotspot/jtreg/gc/arguments/TestG1RemSetFlags.java
index 63b9d782c06..e089ca8f002 100644
--- a/test/hotspot/jtreg/gc/arguments/TestG1RemSetFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestG1RemSetFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java b/test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java
index 07a9065cee1..d641e2aff55 100644
--- a/test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java
+++ b/test/hotspot/jtreg/gc/arguments/TestInitialTenuringThreshold.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java b/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
index 7194e97c768..5c5c3299019 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java b/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java
index 11729aa5827..477632e3e77 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxMinHeapFreeRatioFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java b/test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java
index 13bb36ecc43..e7b2f371ed6 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
index d3a51c40b61..0e91f7f20ab 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
index adb0ae26a9f..86c4c7af8bc 100644
--- a/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
index 460160f045c..d3152073c55 100644
--- a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java b/test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java
index 583176dfc69..efe703f9295 100644
--- a/test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java
+++ b/test/hotspot/jtreg/gc/arguments/TestNewSizeThreadIncrease.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java b/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java
index ee1e73f9550..1590d7ac967 100644
--- a/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestParallelGCThreads.java b/test/hotspot/jtreg/gc/arguments/TestParallelGCThreads.java
index 8cc3292b25f..0ce17efd1a7 100644
--- a/test/hotspot/jtreg/gc/arguments/TestParallelGCThreads.java
+++ b/test/hotspot/jtreg/gc/arguments/TestParallelGCThreads.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java b/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java
index 40dfc4dc7fb..6e2e3c0239e 100644
--- a/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java
+++ b/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java b/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java
index fb4787f452f..af3f77a8a76 100644
--- a/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java
+++ b/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java b/test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java
index f517e094edd..30a9d4260f6 100644
--- a/test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java
+++ b/test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java b/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java
index 3d8f31db864..8f0f17c23a7 100644
--- a/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
index c1e58e071a4..90a29e78c12 100644
--- a/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java
index afe424896b5..adb609f547c 100644
--- a/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java b/test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java
index f944c0c4e74..40ade99c7c7 100644
--- a/test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java
+++ b/test/hotspot/jtreg/gc/arguments/TestUnrecognizedVMOptionsHandling.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgoTools.java b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgoTools.java
index 2a1d2fef879..655773f30c7 100644
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgoTools.java
+++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgoTools.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
index 495b36407b1..9cacff389b6 100644
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
+++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestUseNUMAInterleaving.java b/test/hotspot/jtreg/gc/arguments/TestUseNUMAInterleaving.java
index 29c13f1fd90..1983f86d5da 100644
--- a/test/hotspot/jtreg/gc/arguments/TestUseNUMAInterleaving.java
+++ b/test/hotspot/jtreg/gc/arguments/TestUseNUMAInterleaving.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java b/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java
index cc1f9be6fb7..94cf4691eca 100644
--- a/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java b/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java
index 9af3baf87b3..59289f10c37 100644
--- a/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java
+++ b/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/cslocker/TestCSLocker.java b/test/hotspot/jtreg/gc/cslocker/TestCSLocker.java
index bd5b6e28aa8..3550c4e5f14 100644
--- a/test/hotspot/jtreg/gc/cslocker/TestCSLocker.java
+++ b/test/hotspot/jtreg/gc/cslocker/TestCSLocker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java b/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java
index 511f482980b..cf3445bd656 100644
--- a/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java
+++ b/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java b/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java
index e58b930b519..69a3e7b8742 100644
--- a/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java
+++ b/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/Test2GbHeap.java b/test/hotspot/jtreg/gc/g1/Test2GbHeap.java
index 9b981883714..5241365fd12 100644
--- a/test/hotspot/jtreg/gc/g1/Test2GbHeap.java
+++ b/test/hotspot/jtreg/gc/g1/Test2GbHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestAllocationFailure.java b/test/hotspot/jtreg/gc/g1/TestAllocationFailure.java
index ab5e9d1b060..30bea28b882 100644
--- a/test/hotspot/jtreg/gc/g1/TestAllocationFailure.java
+++ b/test/hotspot/jtreg/gc/g1/TestAllocationFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java
index d1ae8ab734c..fa136c4ff7c 100644
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
index 4e4f864d339..e30a396c275 100644
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java
index 33825bff0b7..58b029037db 100644
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java
index a555977eb3e..e5f9d9549a1 100644
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java b/test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java
index d1cb29b314e..39aa55485bb 100644
--- a/test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java
+++ b/test/hotspot/jtreg/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestHumongousAllocNearlyFullRegion.java b/test/hotspot/jtreg/gc/g1/TestHumongousAllocNearlyFullRegion.java
index 0c25a6d03ae..6aeddacff11 100644
--- a/test/hotspot/jtreg/gc/g1/TestHumongousAllocNearlyFullRegion.java
+++ b/test/hotspot/jtreg/gc/g1/TestHumongousAllocNearlyFullRegion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java b/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java
index 97ffd6c8da7..b12fd50ae69 100644
--- a/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java
+++ b/test/hotspot/jtreg/gc/g1/TestHumongousCodeCacheRoots.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestHumongousConcurrentStartUndo.java b/test/hotspot/jtreg/gc/g1/TestHumongousConcurrentStartUndo.java
index ed5ff35021a..2feb408b64e 100644
--- a/test/hotspot/jtreg/gc/g1/TestHumongousConcurrentStartUndo.java
+++ b/test/hotspot/jtreg/gc/g1/TestHumongousConcurrentStartUndo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestInvalidateArrayCopy.java b/test/hotspot/jtreg/gc/g1/TestInvalidateArrayCopy.java
index 84140ae1679..c9a6eb05dd4 100644
--- a/test/hotspot/jtreg/gc/g1/TestInvalidateArrayCopy.java
+++ b/test/hotspot/jtreg/gc/g1/TestInvalidateArrayCopy.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java b/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java
index 3051cd7310b..af60d485c05 100644
--- a/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java
+++ b/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java b/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java
index 7009ae00d92..b69a759aa5f 100644
--- a/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java
+++ b/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java b/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java
index 0a1c373199c..260c1d3804f 100644
--- a/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java
+++ b/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java b/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
index e0aa0827749..efaea7a097e 100644
--- a/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
+++ b/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestOneEdenRegionAfterGC.java b/test/hotspot/jtreg/gc/g1/TestOneEdenRegionAfterGC.java
index 6bbf0213f36..e22fc13e847 100644
--- a/test/hotspot/jtreg/gc/g1/TestOneEdenRegionAfterGC.java
+++ b/test/hotspot/jtreg/gc/g1/TestOneEdenRegionAfterGC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestPLABOutput.java b/test/hotspot/jtreg/gc/g1/TestPLABOutput.java
index fecb8dcfc41..fa43ccaf733 100644
--- a/test/hotspot/jtreg/gc/g1/TestPLABOutput.java
+++ b/test/hotspot/jtreg/gc/g1/TestPLABOutput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java b/test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java
index c0427e1ada3..f7e38fef6f4 100644
--- a/test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java
+++ b/test/hotspot/jtreg/gc/g1/TestPLABSizeBounds.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java b/test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java
index 7b4303e55a2..38e1f0d48f1 100644
--- a/test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java
+++ b/test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java b/test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java
index 11f02643d1d..a13cf1fa013 100644
--- a/test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java
+++ b/test/hotspot/jtreg/gc/g1/TestPrintRegionRememberedSetInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java
index c2b1be60322..460e4d14fc4 100644
--- a/test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java
+++ b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingThreads.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestRemsetLoggingTools.java b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingTools.java
index 7e44c41e1a4..65b532e43d4 100644
--- a/test/hotspot/jtreg/gc/g1/TestRemsetLoggingTools.java
+++ b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingTools.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java b/test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java
index aef9a98530c..1156a2166c1 100644
--- a/test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java
+++ b/test/hotspot/jtreg/gc/g1/TestSharedArchiveWithPreTouch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java
index 8f68ccba9ad..18affedfd12 100644
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java b/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java
index 7934660a323..cbb82a0b4cd 100644
--- a/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestSkipRebuildRemsetPhase.java b/test/hotspot/jtreg/gc/g1/TestSkipRebuildRemsetPhase.java
index 1dc64bf6255..d973e897fe1 100644
--- a/test/hotspot/jtreg/gc/g1/TestSkipRebuildRemsetPhase.java
+++ b/test/hotspot/jtreg/gc/g1/TestSkipRebuildRemsetPhase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java b/test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java
index 7618e8c1708..5a69a6e5288 100644
--- a/test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java
+++ b/test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
index 2f3b3128038..710236e1aae 100644
--- a/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
+++ b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/humongousObjects/ClassLoaderGenerator.java b/test/hotspot/jtreg/gc/g1/humongousObjects/ClassLoaderGenerator.java
index 01ad5e1c0b3..c4630dc9fce 100644
--- a/test/hotspot/jtreg/gc/g1/humongousObjects/ClassLoaderGenerator.java
+++ b/test/hotspot/jtreg/gc/g1/humongousObjects/ClassLoaderGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/humongousObjects/G1SampleClass.java b/test/hotspot/jtreg/gc/g1/humongousObjects/G1SampleClass.java
index 8e11eff2749..94099654b1d 100644
--- a/test/hotspot/jtreg/gc/g1/humongousObjects/G1SampleClass.java
+++ b/test/hotspot/jtreg/gc/g1/humongousObjects/G1SampleClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java
index 34333e90ef2..813b002a8ea 100644
--- a/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java
+++ b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java
index 0e432177208..c9bc1e0f14e 100644
--- a/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java
+++ b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java
index a962efba460..b0adb1d489f 100644
--- a/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java
+++ b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java
index 7f5259a0855..6f2c7c005df 100644
--- a/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java
+++ b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/logging/TestG1LoggingFailure.java b/test/hotspot/jtreg/gc/g1/logging/TestG1LoggingFailure.java
index eb008f04e52..aba8bdca257 100644
--- a/test/hotspot/jtreg/gc/g1/logging/TestG1LoggingFailure.java
+++ b/test/hotspot/jtreg/gc/g1/logging/TestG1LoggingFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java b/test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java
index 0e8f2b47762..28da6598141 100644
--- a/test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java
+++ b/test/hotspot/jtreg/gc/g1/mixedgc/TestLogging.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java b/test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java
index 407248c7f28..949fd6814a0 100644
--- a/test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java
+++ b/test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedObjectTypes.java b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedObjectTypes.java
index c96f1a1759a..0564c680582 100644
--- a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedObjectTypes.java
+++ b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedObjectTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedObjectsEvacuation.java b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedObjectsEvacuation.java
index 975b1feb536..a48eb91fbd9 100644
--- a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedObjectsEvacuation.java
+++ b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedObjectsEvacuation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedOldObjectsEvacuation.java b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedOldObjectsEvacuation.java
index f30b3e8a7a5..866a7cd583e 100644
--- a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedOldObjectsEvacuation.java
+++ b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedOldObjectsEvacuation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java b/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java
index 4e18e29d155..f5b61e470b0 100644
--- a/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java
+++ b/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java b/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java
index b9192c45fbf..21a70c5fe05 100644
--- a/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java
+++ b/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java b/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java
index 78089ea6452..f69236085fe 100644
--- a/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java
+++ b/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/logging/TestGCId.java b/test/hotspot/jtreg/gc/logging/TestGCId.java
index b1015f46435..318f756b699 100644
--- a/test/hotspot/jtreg/gc/logging/TestGCId.java
+++ b/test/hotspot/jtreg/gc/logging/TestGCId.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java b/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java
index 044ad1cf9f5..ba415686407 100644
--- a/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java
+++ b/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, Google and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
index 96e0e7f14d4..6f64e6e9b5e 100644
--- a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
+++ b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java b/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
index 5955006ec0f..3b89bf04d18 100644
--- a/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
+++ b/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java
index 7e6066557dd..c76e151c761 100644
--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java
+++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceSizeFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/metaspace/TestSizeTransitions.java b/test/hotspot/jtreg/gc/metaspace/TestSizeTransitions.java
index 458a90b08a4..4237b8ce1dd 100644
--- a/test/hotspot/jtreg/gc/metaspace/TestSizeTransitions.java
+++ b/test/hotspot/jtreg/gc/metaspace/TestSizeTransitions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, Twitter, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/gc/serial/HeapChangeLogging.java b/test/hotspot/jtreg/gc/serial/HeapChangeLogging.java
index 486fdbe0ed1..d331a68e29b 100644
--- a/test/hotspot/jtreg/gc/serial/HeapChangeLogging.java
+++ b/test/hotspot/jtreg/gc/serial/HeapChangeLogging.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/shenandoah/TestReferenceRefersToShenandoah.java b/test/hotspot/jtreg/gc/shenandoah/TestReferenceRefersToShenandoah.java
index 9ad81d2d7a7..b03b522ac8d 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestReferenceRefersToShenandoah.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestReferenceRefersToShenandoah.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/shenandoah/TestReferenceShortcutCycle.java b/test/hotspot/jtreg/gc/shenandoah/TestReferenceShortcutCycle.java
index be3d0931aa2..407f8f556cc 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestReferenceShortcutCycle.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestReferenceShortcutCycle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java b/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java
index 70544e8af31..9f3c4286c0f 100644
--- a/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java
+++ b/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java b/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
index d3575e8cd4b..d04f1acf206 100644
--- a/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
+++ b/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
index fb58d5784d4..4057dc0b9e8 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java b/test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java
index e819501aca3..4560d9477c1 100644
--- a/test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java
+++ b/test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
index 42f74df080f..5418bb12492 100644
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
+++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java
index 0741cf1fba3..9c39d156f36 100644
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java
+++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationAgeThreshold.java b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationAgeThreshold.java
index 090a49aa80b..cb634afd32c 100644
--- a/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationAgeThreshold.java
+++ b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationAgeThreshold.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationFullGC.java b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationFullGC.java
index 7105be7d478..c3a73ce29bd 100644
--- a/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationFullGC.java
+++ b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationFullGC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationInterned.java b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationInterned.java
index 124bf9d5cf9..a075285b1ed 100644
--- a/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationInterned.java
+++ b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationInterned.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationPrintOptions.java b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationPrintOptions.java
index 0659bc5aea3..c3bc4f93ff4 100644
--- a/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationPrintOptions.java
+++ b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationPrintOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationTableResize.java b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationTableResize.java
index d82244ef07a..00095a084cc 100644
--- a/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationTableResize.java
+++ b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationTableResize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationYoungGC.java b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationYoungGC.java
index 053dc0a2862..8e93e87c3de 100644
--- a/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationYoungGC.java
+++ b/test/hotspot/jtreg/gc/stringdedup/TestStringDeduplicationYoungGC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/testlibrary/Helpers.java b/test/hotspot/jtreg/gc/testlibrary/Helpers.java
index a0c28ff25f7..32745ec3037 100644
--- a/test/hotspot/jtreg/gc/testlibrary/Helpers.java
+++ b/test/hotspot/jtreg/gc/testlibrary/Helpers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/whitebox/TestWBGC.java b/test/hotspot/jtreg/gc/whitebox/TestWBGC.java
index 38f3593b638..717abe92e20 100644
--- a/test/hotspot/jtreg/gc/whitebox/TestWBGC.java
+++ b/test/hotspot/jtreg/gc/whitebox/TestWBGC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestAlwaysPreTouch.java b/test/hotspot/jtreg/gc/z/TestAlwaysPreTouch.java
index db0471431d1..bee2374dc10 100644
--- a/test/hotspot/jtreg/gc/z/TestAlwaysPreTouch.java
+++ b/test/hotspot/jtreg/gc/z/TestAlwaysPreTouch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestGarbageCollectorMXBean.java b/test/hotspot/jtreg/gc/z/TestGarbageCollectorMXBean.java
index d3cf46d51e8..a0cff4f34a7 100644
--- a/test/hotspot/jtreg/gc/z/TestGarbageCollectorMXBean.java
+++ b/test/hotspot/jtreg/gc/z/TestGarbageCollectorMXBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestMemoryMXBean.java b/test/hotspot/jtreg/gc/z/TestMemoryMXBean.java
index ec1daaa00fb..3e7868230aa 100644
--- a/test/hotspot/jtreg/gc/z/TestMemoryMXBean.java
+++ b/test/hotspot/jtreg/gc/z/TestMemoryMXBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestMemoryManagerMXBean.java b/test/hotspot/jtreg/gc/z/TestMemoryManagerMXBean.java
index 6540d67e855..e71ff6cb301 100644
--- a/test/hotspot/jtreg/gc/z/TestMemoryManagerMXBean.java
+++ b/test/hotspot/jtreg/gc/z/TestMemoryManagerMXBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestNoUncommit.java b/test/hotspot/jtreg/gc/z/TestNoUncommit.java
index cd5833f308f..cb4ab7923c7 100644
--- a/test/hotspot/jtreg/gc/z/TestNoUncommit.java
+++ b/test/hotspot/jtreg/gc/z/TestNoUncommit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestPageCacheFlush.java b/test/hotspot/jtreg/gc/z/TestPageCacheFlush.java
index 847c7b2d117..fbf51bf1f4f 100644
--- a/test/hotspot/jtreg/gc/z/TestPageCacheFlush.java
+++ b/test/hotspot/jtreg/gc/z/TestPageCacheFlush.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestRelocateInPlace.java b/test/hotspot/jtreg/gc/z/TestRelocateInPlace.java
index 723a6504c6a..f1b7e6cb9d5 100644
--- a/test/hotspot/jtreg/gc/z/TestRelocateInPlace.java
+++ b/test/hotspot/jtreg/gc/z/TestRelocateInPlace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestSmallHeap.java b/test/hotspot/jtreg/gc/z/TestSmallHeap.java
index 9ac65d05108..c3c0dddd8e8 100644
--- a/test/hotspot/jtreg/gc/z/TestSmallHeap.java
+++ b/test/hotspot/jtreg/gc/z/TestSmallHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestUncommit.java b/test/hotspot/jtreg/gc/z/TestUncommit.java
index e02773e868f..4d7d4ea393c 100644
--- a/test/hotspot/jtreg/gc/z/TestUncommit.java
+++ b/test/hotspot/jtreg/gc/z/TestUncommit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/gc/z/TestZForceDiscontiguousHeapReservations.java b/test/hotspot/jtreg/gc/z/TestZForceDiscontiguousHeapReservations.java
index fa2485073dd..2cd4675f7d7 100644
--- a/test/hotspot/jtreg/gc/z/TestZForceDiscontiguousHeapReservations.java
+++ b/test/hotspot/jtreg/gc/z/TestZForceDiscontiguousHeapReservations.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java b/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
index 6461d552ed0..f2a17acdd64 100644
--- a/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
+++ b/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/ClassInitErrors/InitExceptionUnloadTest.java b/test/hotspot/jtreg/runtime/ClassInitErrors/InitExceptionUnloadTest.java
index b6342f425a4..57040535df7 100644
--- a/test/hotspot/jtreg/runtime/ClassInitErrors/InitExceptionUnloadTest.java
+++ b/test/hotspot/jtreg/runtime/ClassInitErrors/InitExceptionUnloadTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java b/test/hotspot/jtreg/runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java
index 2f8d0fee721..b229f1bf640 100644
--- a/test/hotspot/jtreg/runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java
+++ b/test/hotspot/jtreg/runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index bd7663c965d..96bbf5e9251 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
@@ -63,6 +63,13 @@ public class VMDeprecatedOptions {
{"CreateMinidumpOnCrash", "false"}
}
));
+ if (Platform.isLinux()) {
+ deprecated.addAll(
+ Arrays.asList(new String[][] {
+ {"UseOprofile", "false"}
+ })
+ );
+ }
if (Platform.isX86() || Platform.isX64()) {
deprecated.addAll(
Arrays.asList(new String[][] {
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
index 665c4cb8b9f..6a7ab088fac 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
@@ -71,6 +71,33 @@ private static void test(long forceAddress, boolean COH, long classSpaceSize, lo
output.shouldContain("Narrow klass base: " + expectedEncodingBaseString + ", Narrow klass shift: " + expectedEncodingShift);
}
+ private static void testFailure(String forceAddressString) throws IOException {
+ ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+ "-Xshare:off", // to make CompressedClassSpaceBaseAddress work
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:CompressedClassSpaceBaseAddress=" + forceAddressString,
+ "-Xmx128m",
+ "-Xlog:metaspace*",
+ "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ output.reportDiagnosticSummary();
+
+ // We ignore cases where we were not able to map at the force address
+ if (!output.contains("Successfully forced class space address to " + forceAddressString)) {
+ throw new SkippedException("Skipping because we cannot force ccs to " + forceAddressString);
+ }
+
+ if (Platform.isAArch64()) {
+ output.shouldHaveExitValue(1);
+ output.shouldContain("Error occurred during initialization of VM");
+ output.shouldContain("CompressedClassSpaceBaseAddress=" + forceAddressString +
+ " given with shift 0, cannot be used to encode class pointers");
+ } else {
+ output.shouldHaveExitValue(0);
+ }
+ }
+
final static long K = 1024;
final static long M = K * 1024;
final static long G = M * 1024;
@@ -123,5 +150,9 @@ public static void main(String[] args) throws Exception {
expectedShift = 10;
test(forceAddress, true, ccsSize, forceAddress, expectedShift);
}
+
+ // Test failure for -XX:CompressedClassBaseAddress and -Xshare:off
+ testFailure("0x0000040001000000");
+
}
}
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java
index 53b8e5aed4d..7bbb9edb7b4 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassSpaceSize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java
index c32027f82b0..14aca26f39f 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/LoadLibrary/TestSunBootLibraryPath.java b/test/hotspot/jtreg/runtime/LoadLibrary/TestSunBootLibraryPath.java
index deb2a000d3d..a9c696444bb 100644
--- a/test/hotspot/jtreg/runtime/LoadLibrary/TestSunBootLibraryPath.java
+++ b/test/hotspot/jtreg/runtime/LoadLibrary/TestSunBootLibraryPath.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/Shutdown/ShutdownTest.java b/test/hotspot/jtreg/runtime/Shutdown/ShutdownTest.java
index 68dc6b2e1a7..9841de52ff1 100644
--- a/test/hotspot/jtreg/runtime/Shutdown/ShutdownTest.java
+++ b/test/hotspot/jtreg/runtime/Shutdown/ShutdownTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.java b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.java
index 6260088fa33..f032e3216b7 100644
--- a/test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.java
+++ b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java b/test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java
index 01b051af8e5..bc125a074ee 100644
--- a/test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java
+++ b/test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/TestCDSVMCrash.java b/test/hotspot/jtreg/runtime/cds/TestCDSVMCrash.java
index 270d4cf96d4..4e40ae3645e 100644
--- a/test/hotspot/jtreg/runtime/cds/TestCDSVMCrash.java
+++ b/test/hotspot/jtreg/runtime/cds/TestCDSVMCrash.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/LambdaInvokeVirtual.java b/test/hotspot/jtreg/runtime/cds/appcds/LambdaInvokeVirtual.java
index 8d59d202bbd..f08a3031f48 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LambdaInvokeVirtual.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LambdaInvokeVirtual.java
@@ -61,13 +61,14 @@ public static void main(String[] args) throws Exception {
.setArchiveName(archiveName);
CDSTestUtils.createArchiveAndCheck(opts);
- // run with archive
+ // run with archive; make sure the lambda is loaded from the archive
CDSOptions runOpts = (new CDSOptions())
- .addPrefix("-cp", appJar)
+ .addPrefix("-cp", appJar, "-Xlog:class+load")
.setArchiveName(archiveName)
.setUseVersion(false)
.addSuffix(mainClass);
OutputAnalyzer output = CDSTestUtils.runWithArchive(runOpts);
+ output.shouldMatch("LambdaInvokeVirtualApp[$][$]Lambda/.*source: shared objects file");
output.shouldHaveExitValue(0);
}
}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java b/test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java
index 77981eb1a78..ea69d2db3cd 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/TestDumpClassListSource.java b/test/hotspot/jtreg/runtime/cds/appcds/TestDumpClassListSource.java
index ca2118ace27..28e92ac3700 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestDumpClassListSource.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestDumpClassListSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
index 8bf3f9fcd27..b92940c7f5e 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckIntegerCacheApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckIntegerCacheApp.java
index 7f66b2339a2..256871d817f 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckIntegerCacheApp.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckIntegerCacheApp.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java
index e74229869ed..4781b78331f 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.java
index 3bc7a4427f4..b0a2551f29e 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.java
index 76a7ddd9e8e..a8527416404 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java
index ac9bb5adc00..2fd5ddbd2bb 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java
index cf6f4cd7fd3..c86d5302d05 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHook.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHook.java
index 7c0d90dd4c8..442cca4d122 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHook.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHook.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java
index 8e0b939458f..a63b001863a 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java
index 004cc7bb5db..91293531611 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, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
index 36914b7de25..9e934105f18 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesNotNullTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesNotNullTest.java
index db2e54843f4..523f8daba91 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesNotNullTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ResolvedReferencesNotNullTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
index 3e2145c7821..05519e1f4dd 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
index 4026f1d4f84..181f23d8396 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java
index 71d984d3a63..76bf66a49b0 100644
--- a/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/jni/FindClass/FindClassFromBoot.java b/test/hotspot/jtreg/runtime/jni/FindClass/FindClassFromBoot.java
index 4f59af310bf..3f7ede67c22 100644
--- a/test/hotspot/jtreg/runtime/jni/FindClass/FindClassFromBoot.java
+++ b/test/hotspot/jtreg/runtime/jni/FindClass/FindClassFromBoot.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/jni/FindClassUtf8/FindClassUtf8.java b/test/hotspot/jtreg/runtime/jni/FindClassUtf8/FindClassUtf8.java
index 7b0a4cc46bf..823d5872cf4 100644
--- a/test/hotspot/jtreg/runtime/jni/FindClassUtf8/FindClassUtf8.java
+++ b/test/hotspot/jtreg/runtime/jni/FindClassUtf8/FindClassUtf8.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/jni/atExit/TestAtExit.java b/test/hotspot/jtreg/runtime/jni/atExit/TestAtExit.java
index 82d834c869c..6a3eaebd8cb 100644
--- a/test/hotspot/jtreg/runtime/jni/atExit/TestAtExit.java
+++ b/test/hotspot/jtreg/runtime/jni/atExit/TestAtExit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/jni/checked/TestCheckedJniExceptionCheck.java b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedJniExceptionCheck.java
index 3c6efeb9a2d..ebbe21b598e 100644
--- a/test/hotspot/jtreg/runtime/jni/checked/TestCheckedJniExceptionCheck.java
+++ b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedJniExceptionCheck.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
index 07e46a1dfca..c7063151f94 100644
--- a/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
+++ b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/jni/nativeStack/TestNativeStack.java b/test/hotspot/jtreg/runtime/jni/nativeStack/TestNativeStack.java
index d336097b8bd..778372dbb9f 100644
--- a/test/hotspot/jtreg/runtime/jni/nativeStack/TestNativeStack.java
+++ b/test/hotspot/jtreg/runtime/jni/nativeStack/TestNativeStack.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/jni/registerNativesWarning/TestRegisterNativesWarning.java b/test/hotspot/jtreg/runtime/jni/registerNativesWarning/TestRegisterNativesWarning.java
index e3d043ee4af..e913e6d0ff1 100644
--- a/test/hotspot/jtreg/runtime/jni/registerNativesWarning/TestRegisterNativesWarning.java
+++ b/test/hotspot/jtreg/runtime/jni/registerNativesWarning/TestRegisterNativesWarning.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/logging/MonitorInflationTest.java b/test/hotspot/jtreg/runtime/logging/MonitorInflationTest.java
index 8666e2ee774..b19c30888c1 100644
--- a/test/hotspot/jtreg/runtime/logging/MonitorInflationTest.java
+++ b/test/hotspot/jtreg/runtime/logging/MonitorInflationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/logging/RedefineClasses.java b/test/hotspot/jtreg/runtime/logging/RedefineClasses.java
index 34c8900e616..8b75802cd3b 100644
--- a/test/hotspot/jtreg/runtime/logging/RedefineClasses.java
+++ b/test/hotspot/jtreg/runtime/logging/RedefineClasses.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/os/THPsInThreadStackPreventionTest.java b/test/hotspot/jtreg/runtime/os/THPsInThreadStackPreventionTest.java
index 02fb77bf242..163a665b687 100644
--- a/test/hotspot/jtreg/runtime/os/THPsInThreadStackPreventionTest.java
+++ b/test/hotspot/jtreg/runtime/os/THPsInThreadStackPreventionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Red Hat Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/runtime/os/TestHugePageDetection.java b/test/hotspot/jtreg/runtime/os/TestHugePageDetection.java
index 7231f30ed41..5813cf16b45 100644
--- a/test/hotspot/jtreg/runtime/os/TestHugePageDetection.java
+++ b/test/hotspot/jtreg/runtime/os/TestHugePageDetection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Red Hat Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/runtime/stack/Stack004.java b/test/hotspot/jtreg/runtime/stack/Stack004.java
index 652e4103acf..d005ae284d8 100644
--- a/test/hotspot/jtreg/runtime/stack/Stack004.java
+++ b/test/hotspot/jtreg/runtime/stack/Stack004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/stack/Stack017.java b/test/hotspot/jtreg/runtime/stack/Stack017.java
index 47db5886a00..43b97ac9894 100644
--- a/test/hotspot/jtreg/runtime/stack/Stack017.java
+++ b/test/hotspot/jtreg/runtime/stack/Stack017.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/stack/Stack018.java b/test/hotspot/jtreg/runtime/stack/Stack018.java
index a54ffff6e6c..79c73d2039b 100644
--- a/test/hotspot/jtreg/runtime/stack/Stack018.java
+++ b/test/hotspot/jtreg/runtime/stack/Stack018.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/stack/Stack019.java b/test/hotspot/jtreg/runtime/stack/Stack019.java
index 7a20ae3e6a2..e3e244b5c3e 100644
--- a/test/hotspot/jtreg/runtime/stack/Stack019.java
+++ b/test/hotspot/jtreg/runtime/stack/Stack019.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/stringtable/StringTableCleaningTest.java b/test/hotspot/jtreg/runtime/stringtable/StringTableCleaningTest.java
index a62d61166fc..7f81a945d9e 100644
--- a/test/hotspot/jtreg/runtime/stringtable/StringTableCleaningTest.java
+++ b/test/hotspot/jtreg/runtime/stringtable/StringTableCleaningTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/runtime/whitebox/TestWBDeflateIdleMonitors.java b/test/hotspot/jtreg/runtime/whitebox/TestWBDeflateIdleMonitors.java
index 9fc4fdcaef5..a225b3be18d 100644
--- a/test/hotspot/jtreg/runtime/whitebox/TestWBDeflateIdleMonitors.java
+++ b/test/hotspot/jtreg/runtime/whitebox/TestWBDeflateIdleMonitors.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/sanity/BasicVMTest.java b/test/hotspot/jtreg/sanity/BasicVMTest.java
index 47773d63df4..f202dabed5c 100644
--- a/test/hotspot/jtreg/sanity/BasicVMTest.java
+++ b/test/hotspot/jtreg/sanity/BasicVMTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java
index 885cfd55be4..157c1713ec2 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
index 8d40423b5e8..5e4f73cedd5 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerMemoryStatisticTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerMemoryStatisticTest.java
index 02bc77263d8..a462356f027 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerMemoryStatisticTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerMemoryStatisticTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Red Hat, Inc. and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
index 23c414dfd6e..02e13d68375 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @test
* @bug 8221730
* @summary Test of diagnostic command VM.version (tests all DCMD executors)
- * @enablePreview
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.module
* java.compiler
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSharedClass.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSharedClass.java
index f8c73173f60..3ff063833c3 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSharedClass.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSharedClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestLambdaFormRetransformation.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestLambdaFormRetransformation.java
index 48c9ad1328e..e3fe313a5a8 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestLambdaFormRetransformation.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestLambdaFormRetransformation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestRedefineWithUnresolvedClass.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestRedefineWithUnresolvedClass.java
index 4bcd2a44588..68a8b7988ab 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestRedefineWithUnresolvedClass.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestRedefineWithUnresolvedClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
index 9a339f8202b..49f86065c5f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
index c4e13858a7d..147b3a50faa 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java b/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java
index 61d81c0fd46..7dd4640650f 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/testlibrary/ctw/Makefile b/test/hotspot/jtreg/testlibrary/ctw/Makefile
index b67500d0c5e..4cf20b12e52 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/Makefile
+++ b/test/hotspot/jtreg/testlibrary/ctw/Makefile
@@ -42,8 +42,8 @@ JAVAC = $(JDK_HOME)/bin/javac
JAR = $(JDK_HOME)/bin/jar
SRC_FILES = $(shell find $(SRC_DIR) -name '*.java')
-# Exclude files that need '--enable-preview' to compile.
-LIB_FILES = $(filter-out %ModuleInfoWriter.java, $(shell find $(TESTLIBRARY_DIR)/jdk/test/lib/ \
+# Must exclude files that need '--enable-preview' to compile, if there is any.
+LIB_FILES = $(shell find $(TESTLIBRARY_DIR)/jdk/test/lib/ \
$(TESTLIBRARY_DIR)/jdk/test/lib/process \
$(TESTLIBRARY_DIR)/jdk/test/lib/util \
$(TESTLIBRARY_DIR)/jtreg \
diff --git a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
index 7b495e46e33..2ab7c26a6d4 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
+++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
index e2c7230bc0d..72d481ac616 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
+++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
@@ -172,8 +172,14 @@ private void startCtwforAllClasses() {
long classStart = start(totalClassCount);
long classStop = stop(totalClassCount);
-
long classCount = classStop - classStart;
+
+ boolean allowZeroClassCount = Boolean.getBoolean("sun.hotspot.tools.ctw.allow_zero_class_count");
+ if (allowZeroClassCount && totalClassCount == 0L) {
+ System.out.println("WARN: " + target + "(at " + targetPath + ") has no classes. Ignoring.");
+ return;
+ }
+
Asserts.assertGreaterThan(classCount, 0L,
target + "(at " + targetPath + ") does not have any classes");
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/CheckedTestExample.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/CheckedTestExample.java
index b2a0b40c582..906dda40db7 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/CheckedTestExample.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/CheckedTestExample.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/IRExample.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/IRExample.java
index 6a0a605e4ab..3a6339da160 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/IRExample.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/IRExample.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/NormalTestExample.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/NormalTestExample.java
index 06dda1641ed..8e6f47643d6 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/NormalTestExample.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/NormalTestExample.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestAccessModifiers.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestAccessModifiers.java
index ff609ab68bd..189f5b0a60e 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestAccessModifiers.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestAccessModifiers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBasics.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBasics.java
index c8479349131..b5006290047 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBasics.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBasics.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCheckedTests.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCheckedTests.java
index ff0aeae8e30..5b7cd3c38a8 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCheckedTests.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCheckedTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
index f0056ebc79d..3c4b769eaae 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/UnloadingTest.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/UnloadingTest.java
index aae4c0b01fc..77b6340a8bf 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/UnloadingTest.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/UnloadingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/phantom001/phantom001.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/phantom001/phantom001.java
index 9f5fc94221e..3f9604758ec 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/phantom001/phantom001.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/PhantomReference/phantom001/phantom001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java
index 82fda0a3bd3..306b9bf5780 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/MemOptionsTest.java b/test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/MemOptionsTest.java
index 4547bcdbc30..d6183630cca 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/MemOptionsTest.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/huge/quicklook/largeheap/MemOptions/MemOptionsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_0_1/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_0_1/TestDescription.java
index 12768372d50..f3155d235c7 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_0_1/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_0_1/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_10_20/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_10_20/TestDescription.java
index a630ece929c..3eff7bf14ca 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_10_20/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_10_20/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_70_80/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_70_80/TestDescription.java
index 1fcf766b2eb..51f1dce0391 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_70_80/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_70_80/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_99_100/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_99_100/TestDescription.java
index d2025c8dc0e..72b4eda7094 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_99_100/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/gc/watermark_99_100/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/share/HeapOOMEException.java b/test/hotspot/jtreg/vmTestbase/metaspace/share/HeapOOMEException.java
index 493189a58c7..c8243f954c0 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/share/HeapOOMEException.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/share/HeapOOMEException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingByFillingMetaspace.java b/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingByFillingMetaspace.java
index 217abc25c96..3afab29f8d1 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingByFillingMetaspace.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingByFillingMetaspace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingHelper.java b/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingHelper.java
index 7c9e4bec1a6..d0e9d8a76b3 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingHelper.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingWithWhiteBox.java b/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingWithWhiteBox.java
index 678e9551fa7..84baa3cecba 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingWithWhiteBox.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/share/TriggerUnloadingWithWhiteBox.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/common/StressHierarchyBaseClass.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/common/StressHierarchyBaseClass.java
index 20fcdabb13c..ae3c6a2e3d1 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/common/StressHierarchyBaseClass.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/common/StressHierarchyBaseClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java
index 003b1f36edd..6a798b5bd02 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java
index 5dfd33430e3..e700fbda473 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java
index 81ad1dd48ac..439f094fe4d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/TestDriver.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/TestDriver.java
index 48245698712..6ab71566c83 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/TestDriver.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/TestDriver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t.java
index 964283d2b01..0f2c1292f7d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/TestDriver.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/TestDriver.java
index 3d474c4e149..c36c5273684 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/TestDriver.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/TestDriver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
index 3c297299f6a..0147bfed608 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
@@ -74,6 +74,7 @@ static volatile int eventsEnd = 0;
/* testcase(s) */
static int prepare();
static int checkThreads(const char* kind);
+static int waitSuspended(const char* kind);
static int resumeThreads(const char* kind);
static int clean();
@@ -125,7 +126,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
nsk_jvmti_setFailStatus();
}
- /* check if all threads suspended on THREAD_START events */
+ /* check if all THREAD_START events are generated */
if (eventsStart != THREADS_COUNT) {
NSK_COMPLAIN2("Unexpected number of THREAD_START events:\n"
"# received: %d\n"
@@ -133,6 +134,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
eventsStart, THREADS_COUNT);
}
+ /* wait until all threads are suspended */
+ if (!NSK_VERIFY(waitSuspended("starting"))) {
+ return;
+ }
+
NSK_DISPLAY0("Testcase #1: check threads on THREAD_START\n");
if (!NSK_VERIFY(checkThreads("starting")))
return;
@@ -175,7 +181,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
nsk_jvmti_setFailStatus();
}
- /* check ia all threads suspended on THREAD_END event */
+ /* check if all THREAD_END event are generated */
if (eventsEnd != THREADS_COUNT) {
NSK_COMPLAIN2("Unexpected number of THREAD_END events:\n"
"# received: %d\n"
@@ -183,6 +189,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
eventsEnd, THREADS_COUNT);
}
+ /* wait until all threads are suspended */
+ if (!NSK_VERIFY(waitSuspended("finishing"))) {
+ return;
+ }
+
NSK_DISPLAY0("Testcase #2: check threads on THREAD_END\n");
if (!NSK_VERIFY(checkThreads("finishing")))
return;
@@ -210,6 +221,31 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
/* ============================================================================= */
+static int waitSuspended(const char* kind) {
+ NSK_DISPLAY1("Wait for %s threads to be suspended\n", kind);
+ for (int i = 0; i < THREADS_COUNT; i++) {
+ for (int j = 0; j * TIMEOUT_DELTA < timeout; j++) {
+ jint state = 0;
+ if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threadsList[i], &state))) {
+ nsk_jvmti_setFailStatus();
+ break;
+ }
+ if ((state & JVMTI_THREAD_STATE_ALIVE) == 0) {
+ NSK_COMPLAIN3("%s thread %s is not alive: %x\n", kind, threadsName[i], (int)state);
+ nsk_jvmti_setFailStatus();
+ break;
+ }
+ if ((state & JVMTI_THREAD_STATE_SUSPENDED) != 0) {
+ NSK_DISPLAY2(" OK: %s thread %s is suspended\n", kind, threadsName[i]);
+ break;
+ }
+ NSK_DISPLAY2(" %s thread %s is not suspended, waiting\n", kind, threadsName[i]);
+ nsk_jvmti_sleep(TIMEOUT_DELTA);
+ }
+ }
+ return NSK_TRUE; // continue execution
+}
+
/**
* Resume all threads in given state.
*/
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/README b/test/hotspot/jtreg/vmTestbase/nsk/share/README
index a696a90d516..854ab4e8bf5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/README
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/README
@@ -1,4 +1,4 @@
-Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
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/test/hotspot/jtreg/vmTestbase/nsk/share/test/Tests.java b/test/hotspot/jtreg/vmTestbase/nsk/share/test/Tests.java
index 2d5dfa3f623..fd2d599da17 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/test/Tests.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/test/Tests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/Test.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/Test.java
index 0c8f59c4fae..b9218480788 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/ProcessExecutor.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/ProcessExecutor.java
index 9ab0a781d1f..0030d01ceec 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/ProcessExecutor.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/ProcessExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamListener.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamListener.java
index c2d4e58c5bd..df14495870b 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamListener.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamLogger.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamLogger.java
index 690f0bbfbfc..5622161eff5 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamLogger.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamLogger.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamReader.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamReader.java
index d983ae1aebe..310f29535bb 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamReader.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/complog/share/StreamReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/FileUtils.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/FileUtils.java
index c749551e85b..c74dd3467d3 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/FileUtils.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/FileUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jaxp/TEST.groups b/test/jaxp/TEST.groups
index f8cb73c4393..04926c32ce2 100644
--- a/test/jaxp/TEST.groups
+++ b/test/jaxp/TEST.groups
@@ -1,4 +1,4 @@
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 61be4bf5168..2f584f2b834 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -99,7 +99,8 @@ tier4 = \
/ \
-:tier1 \
-:tier2 \
- -:tier3
+ -:tier3 \
+ :jdk_foreign_stress
###############################################################################
#
@@ -393,6 +394,10 @@ jdk_foreign = \
-java/foreign/TestMatrix.java \
-java/foreign/TestUpcallStress.java
+jdk_foreign_stress = \
+ java/foreign/TestMatrix.java \
+ java/foreign/TestUpcallStress.java
+
jdk_vector = \
jdk/incubator/vector
@@ -628,7 +633,7 @@ jdk_core_manual_no_input = \
java/util/Vector/Bug8148174.java \
com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java \
com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java \
- javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java
+ javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java
jdk_security_manual_no_input = \
:jdk_security_infra \
diff --git a/test/jdk/build/AbsPathsInImage.java b/test/jdk/build/AbsPathsInImage.java
index 229094a0920..7821b60670a 100644
--- a/test/jdk/build/AbsPathsInImage.java
+++ b/test/jdk/build/AbsPathsInImage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java
index 65b34507835..a976a3a5254 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/com/sun/crypto/provider/KeyAgreement/SupportedDHParamGensLongKey.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/SupportedDHParamGensLongKey.java
index 7d2570991d5..24084803a61 100644
--- a/test/jdk/com/sun/crypto/provider/KeyAgreement/SupportedDHParamGensLongKey.java
+++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/SupportedDHParamGensLongKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/com/sun/crypto/provider/TLS/TestMasterSecret.java b/test/jdk/com/sun/crypto/provider/TLS/TestMasterSecret.java
index f34bdff2ef7..8d44215a8b6 100644
--- a/test/jdk/com/sun/crypto/provider/TLS/TestMasterSecret.java
+++ b/test/jdk/com/sun/crypto/provider/TLS/TestMasterSecret.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/com/sun/jdi/BadAgentPath.java b/test/jdk/com/sun/jdi/BadAgentPath.java
index 3ef0adadc84..26547e7d36b 100644
--- a/test/jdk/com/sun/jdi/BadAgentPath.java
+++ b/test/jdk/com/sun/jdi/BadAgentPath.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/com/sun/jdi/DoubleAgentTest.java b/test/jdk/com/sun/jdi/DoubleAgentTest.java
index ea2a109ed9b..e2642f8ad2e 100644
--- a/test/jdk/com/sun/jdi/DoubleAgentTest.java
+++ b/test/jdk/com/sun/jdi/DoubleAgentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/com/sun/jdi/SuspendNoFlagTest.java b/test/jdk/com/sun/jdi/SuspendNoFlagTest.java
index 31e717a63d0..05919723c7d 100644
--- a/test/jdk/com/sun/jdi/SuspendNoFlagTest.java
+++ b/test/jdk/com/sun/jdi/SuspendNoFlagTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java b/test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java
index 84c7837e0b3..2ce3dfd016d 100644
--- a/test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java
+++ b/test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* 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,19 +23,16 @@
/*
* @test
- * @bug 8288109 8235786
+ * @bug 8288109
* @summary Tests for HttpExchange set/getAttribute
* @library /test/lib
* @run junit/othervm ExchangeAttributeTest
*/
-import com.sun.net.httpserver.Filter;
-import com.sun.net.httpserver.HttpContext;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
import jdk.test.lib.net.URIBuilder;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -56,87 +53,44 @@
public class ExchangeAttributeTest {
- private static final InetAddress LOOPBACK_ADDR = InetAddress.getLoopbackAddress();
- private static final boolean ENABLE_LOGGING = true;
- private static final Logger logger = Logger.getLogger("com.sun.net.httpserver");
-
- private static HttpServer server;
+ static final InetAddress LOOPBACK_ADDR = InetAddress.getLoopbackAddress();
+ static final boolean ENABLE_LOGGING = true;
+ static final Logger logger = Logger.getLogger("com.sun.net.httpserver");
@BeforeAll
- public static void setup() throws Exception {
+ public static void setup() {
if (ENABLE_LOGGING) {
ConsoleHandler ch = new ConsoleHandler();
logger.setLevel(Level.ALL);
ch.setLevel(Level.ALL);
logger.addHandler(ch);
}
- server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 10);
- server.createContext("/normal", new AttribHandler());
- final HttpContext filteredCtx = server.createContext("/filtered", new AttribHandler());
- filteredCtx.getFilters().add(new AttributeAddingFilter());
- server.start();
- System.out.println("Server started at " + server.getAddress());
- }
-
- @AfterAll
- public static void afterAll() {
- if (server != null) {
- System.out.println("Stopping server " + server.getAddress());
- server.stop(0);
- }
}
- /*
- * Verifies that HttpExchange.setAttribute() allows for null value.
- */
@Test
- public void testNullAttributeValue() throws Exception {
- try (var client = HttpClient.newBuilder().proxy(NO_PROXY).build()) {
- var request = HttpRequest.newBuilder(uri(server, "/normal", null)).build();
+ public void testExchangeAttributes() throws Exception {
+ var handler = new AttribHandler();
+ var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR,0), 10);
+ server.createContext("/", handler);
+ server.start();
+ try {
+ var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
+ var request = HttpRequest.newBuilder(uri(server, "")).build();
var response = client.send(request, HttpResponse.BodyHandlers.ofString());
assertEquals(200, response.statusCode());
- }
- }
-
- /*
- * Verifies that an attribute set on one exchange is accessible to another exchange that
- * belongs to the same HttpContext.
- */
- @Test
- public void testSharedAttribute() throws Exception {
- try (var client = HttpClient.newBuilder().proxy(NO_PROXY).build()) {
- final var firstReq = HttpRequest.newBuilder(uri(server, "/filtered", "firstreq"))
- .build();
- System.out.println("issuing request " + firstReq);
- final var firstResp = client.send(firstReq, HttpResponse.BodyHandlers.ofString());
- assertEquals(200, firstResp.statusCode());
-
- // issue the second request
- final var secondReq = HttpRequest.newBuilder(uri(server, "/filtered", "secondreq"))
- .build();
- System.out.println("issuing request " + secondReq);
- final var secondResp = client.send(secondReq, HttpResponse.BodyHandlers.ofString());
- assertEquals(200, secondResp.statusCode());
-
- // verify that the filter was invoked for both the requests. the filter internally
- // does the setAttribute() and getAttribute() and asserts that the attribute value
- // set by the first exchange was available through the second exchange.
- assertTrue(AttributeAddingFilter.filteredFirstReq, "Filter wasn't invoked for "
- + firstReq.uri());
- assertTrue(AttributeAddingFilter.filteredSecondReq, "Filter wasn't invoked for "
- + secondReq.uri());
+ } finally {
+ server.stop(0);
}
}
// --- infra ---
- static URI uri(HttpServer server, String path, String query) throws URISyntaxException {
+ static URI uri(HttpServer server, String path) throws URISyntaxException {
return URIBuilder.newBuilder()
.scheme("http")
.loopback()
.port(server.getAddress().getPort())
.path(path)
- .query(query)
.build();
}
@@ -158,54 +112,4 @@ public void handle(HttpExchange exchange) throws IOException {
}
}
}
-
- private static final class AttributeAddingFilter extends Filter {
-
- private static final String ATTR_NAME ="foo-bar";
- private static final String ATTR_VAL ="hello-world";
- private static volatile boolean filteredFirstReq;
- private static volatile boolean filteredSecondReq;
-
- @Override
- public void doFilter(final HttpExchange exchange, final Chain chain) throws IOException {
- if (exchange.getRequestURI().getQuery().contains("firstreq")) {
- filteredFirstReq = true;
- // add a request attribute through the exchange, for this first request
- // and at the same time verify that the attribute doesn't already exist
- final Object attrVal = exchange.getAttribute(ATTR_NAME);
- if (attrVal != null) {
- throw new IOException("attribute " + ATTR_NAME + " with value: " + attrVal
- + " unexpectedly present in exchange: " + exchange.getRequestURI());
- }
- // set the value
- exchange.setAttribute(ATTR_NAME, ATTR_VAL);
- System.out.println(exchange.getRequestURI() + " set attribute "
- + ATTR_NAME + "=" + ATTR_VAL);
- } else if (exchange.getRequestURI().getQuery().contains("secondreq")) {
- filteredSecondReq = true;
- // verify the attribute is already set and the value is the expected one.
- final Object attrVal = exchange.getAttribute(ATTR_NAME);
- if (attrVal == null) {
- throw new IOException("attribute " + ATTR_NAME + " is missing in exchange: "
- + exchange.getRequestURI());
- }
- if (!ATTR_VAL.equals(attrVal)) {
- throw new IOException("unexpected value: " + attrVal + " for attribute "
- + ATTR_NAME + " in exchange: " + exchange.getRequestURI());
- }
- System.out.println(exchange.getRequestURI() + " found attribute "
- + ATTR_NAME + "=" + attrVal);
- } else {
- // unexpected request
- throw new IOException("unexpected request " + exchange.getRequestURI());
- }
- // let the request proceed
- chain.doFilter(exchange);
- }
-
- @Override
- public String description() {
- return "AttributeAddingFilter";
- }
- }
}
diff --git a/test/jdk/com/sun/tools/attach/ProviderTest.java b/test/jdk/com/sun/tools/attach/ProviderTest.java
index e006bfd6b6d..01498709e55 100644
--- a/test/jdk/com/sun/tools/attach/ProviderTest.java
+++ b/test/jdk/com/sun/tools/attach/ProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/com/sun/tools/attach/TempDirTest.java b/test/jdk/com/sun/tools/attach/TempDirTest.java
index b9ce4acb141..e0552d15fce 100644
--- a/test/jdk/com/sun/tools/attach/TempDirTest.java
+++ b/test/jdk/com/sun/tools/attach/TempDirTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/Cursor/JPanelCursorTest/JPanelCursorTest.java b/test/jdk/java/awt/Cursor/JPanelCursorTest/JPanelCursorTest.java
index 8acd622e592..33437a6545e 100644
--- a/test/jdk/java/awt/Cursor/JPanelCursorTest/JPanelCursorTest.java
+++ b/test/jdk/java/awt/Cursor/JPanelCursorTest/JPanelCursorTest.java
@@ -44,16 +44,18 @@
public class JPanelCursorTest {
public static void main(String[] args) throws Exception {
- String INSTRUCTIONS = """
+ final String INSTRUCTIONS = """
This test checks for setCursor in a JPanel when added to a
JFrame's contentPane.
1. Verify that the cursor in the left side of the test window
- is a default cursor.
+ is a text cursor.
2. Verify that the cursor changes to the crosshair cursor when
pointing over the button.
3. Verify that the cursor changes to the hand cursor when in
the right side of the splitpane (and not on the button).
+ 4. Verify that the cursor changes to the wait cursor when in
+ the empty bottom section of the test window.
If true, then pass the test. Otherwise, fail this test.
""";
@@ -61,14 +63,14 @@ the right side of the splitpane (and not on the button).
PassFailJFrame.builder()
.title("Test Instructions")
.instructions(INSTRUCTIONS)
- .columns(35)
+ .columns(37)
.testUI(JPanelCursorTest::createUI)
.build()
.awaitAndCheck();
}
public static JFrame createUI() {
- JFrame frame = new JFrame();
+ JFrame frame = new JFrame("Cursor Test Frame");
JSplitPane j = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
ExtJComponent pane = new ExtJComponent();
@@ -78,11 +80,12 @@ public static JFrame createUI() {
j.setLeftComponent(pane);
j.setRightComponent(panel);
j.setContinuousLayout(true);
+ j.setSize(200, 200);
- frame.getContentPane().add("Center", j);
- pane.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+ frame.getContentPane().add("North", j);
+ pane.setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
frame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
- frame.pack();
+ frame.setSize(300, 200);
return frame;
}
}
@@ -96,7 +99,7 @@ public ExtJComponent() {
setBorder(new BevelBorder(BevelBorder.RAISED));
}
public void paintComponent(Graphics g) {
- g.drawString("Default", 20, 30);
+ g.drawString("Text", 20, 30);
}
public Dimension getPreferredSize() {
return new Dimension(100, 100);
@@ -104,7 +107,7 @@ public Dimension getPreferredSize() {
}
class CursorBugPanel extends JPanel {
- public CursorBugPanel () {
+ public CursorBugPanel() {
// BUG: fails to set cursor for panel
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
diff --git a/test/jdk/java/awt/Desktop/8064934/bug8064934.java b/test/jdk/java/awt/Desktop/8064934/bug8064934.java
index 6d4ffc08f34..82d9838b7f8 100644
--- a/test/jdk/java/awt/Desktop/8064934/bug8064934.java
+++ b/test/jdk/java/awt/Desktop/8064934/bug8064934.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/Graphics2D/LargeWindowPaintTest.java b/test/jdk/java/awt/Graphics2D/LargeWindowPaintTest.java
index 2c61a29aacb..f6ef90648e3 100644
--- a/test/jdk/java/awt/Graphics2D/LargeWindowPaintTest.java
+++ b/test/jdk/java/awt/Graphics2D/LargeWindowPaintTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/List/ActionEventTest/ActionEventTest.java b/test/jdk/java/awt/List/ActionEventTest/ActionEventTest.java
index 19665a6dc29..8c8af6e6f35 100644
--- a/test/jdk/java/awt/List/ActionEventTest/ActionEventTest.java
+++ b/test/jdk/java/awt/List/ActionEventTest/ActionEventTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.sh b/test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.sh
index e1c00e9adc0..9cb6b814478 100644
--- a/test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.sh
+++ b/test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# 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/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java b/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java
index 23920e89c50..d4b21e10c6a 100644
--- a/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java
+++ b/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java b/test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java
index eaf60655441..30bd0fd6a63 100644
--- a/test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java
+++ b/test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/a11y/AccessibleComponentTest.java b/test/jdk/java/awt/a11y/AccessibleComponentTest.java
index ae2943d6994..99f1cb15004 100644
--- a/test/jdk/java/awt/a11y/AccessibleComponentTest.java
+++ b/test/jdk/java/awt/a11y/AccessibleComponentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, JetBrains s.r.o.. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java
index 9d80f0bb676..f1e3a0bfaad 100644
--- a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java
+++ b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java
index 4c409a66408..665e8fda839 100644
--- a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java
+++ b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/dnd/DropActionChangeTest.java b/test/jdk/java/awt/dnd/DropActionChangeTest.java
index 2bfbb44bbfd..55f0ebaeeb1 100644
--- a/test/jdk/java/awt/dnd/DropActionChangeTest.java
+++ b/test/jdk/java/awt/dnd/DropActionChangeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java b/test/jdk/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java
index 718891c21fa..ab6262c771f 100644
--- a/test/jdk/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java
+++ b/test/jdk/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java b/test/jdk/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java
index fa3f7d9b315..0e11d94932e 100644
--- a/test/jdk/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java
+++ b/test/jdk/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/im/memoryleak/InputContextMemoryLeakTest.java b/test/jdk/java/awt/im/memoryleak/InputContextMemoryLeakTest.java
index 2b933d8e223..f485d79dd3c 100644
--- a/test/jdk/java/awt/im/memoryleak/InputContextMemoryLeakTest.java
+++ b/test/jdk/java/awt/im/memoryleak/InputContextMemoryLeakTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/print/PrinterJob/AlphaPrintTest.java b/test/jdk/java/awt/print/PrinterJob/AlphaPrintTest.java
index 9a1ff616ee9..a87c7282087 100644
--- a/test/jdk/java/awt/print/PrinterJob/AlphaPrintTest.java
+++ b/test/jdk/java/awt/print/PrinterJob/AlphaPrintTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/print/PrinterJob/PrintToDir.java b/test/jdk/java/awt/print/PrinterJob/PrintToDir.java
index f451f8362e3..404c8feff91 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintToDir.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintToDir.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/awt/regtesthelpers/Util.java b/test/jdk/java/awt/regtesthelpers/Util.java
index 5de2743d312..6d570e903b6 100644
--- a/test/jdk/java/awt/regtesthelpers/Util.java
+++ b/test/jdk/java/awt/regtesthelpers/Util.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/TestHandshake.java b/test/jdk/java/foreign/TestHandshake.java
index ff85c3482a2..86200b0e7d6 100644
--- a/test/jdk/java/foreign/TestHandshake.java
+++ b/test/jdk/java/foreign/TestHandshake.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/TestLayouts.java b/test/jdk/java/foreign/TestLayouts.java
index eb271db4e5e..2c826ec9e21 100644
--- a/test/jdk/java/foreign/TestLayouts.java
+++ b/test/jdk/java/foreign/TestLayouts.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/TestMatrix.java b/test/jdk/java/foreign/TestMatrix.java
index 70be29fd55b..2767ca7bde2 100644
--- a/test/jdk/java/foreign/TestMatrix.java
+++ b/test/jdk/java/foreign/TestMatrix.java
@@ -35,7 +35,7 @@
* @modules java.base/jdk.internal.foreign
* @build NativeTestHelper CallGeneratorHelper TestUpcallHighArity
*
- * @run testng/othervm/native/manual
+ * @run testng/othervm/native
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
diff --git a/test/jdk/java/foreign/TestMemoryAccessInstance.java b/test/jdk/java/foreign/TestMemoryAccessInstance.java
index b749c96ac54..de1a17f5f11 100644
--- a/test/jdk/java/foreign/TestMemoryAccessInstance.java
+++ b/test/jdk/java/foreign/TestMemoryAccessInstance.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/TestRestricted.java b/test/jdk/java/foreign/TestRestricted.java
index b5b0974e57a..771037ff8ba 100644
--- a/test/jdk/java/foreign/TestRestricted.java
+++ b/test/jdk/java/foreign/TestRestricted.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/TestScopedOperations.java b/test/jdk/java/foreign/TestScopedOperations.java
index d680d234145..92b4ea5370f 100644
--- a/test/jdk/java/foreign/TestScopedOperations.java
+++ b/test/jdk/java/foreign/TestScopedOperations.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/TestSegmentAllocators.java b/test/jdk/java/foreign/TestSegmentAllocators.java
index 87418f39d90..c178f64450d 100644
--- a/test/jdk/java/foreign/TestSegmentAllocators.java
+++ b/test/jdk/java/foreign/TestSegmentAllocators.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/TestStubAllocFailure.java b/test/jdk/java/foreign/TestStubAllocFailure.java
index 154b455e3f2..b3b327e788c 100644
--- a/test/jdk/java/foreign/TestStubAllocFailure.java
+++ b/test/jdk/java/foreign/TestStubAllocFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/TestValueLayouts.java b/test/jdk/java/foreign/TestValueLayouts.java
index 50f7f4c753f..4c30a3c7d03 100644
--- a/test/jdk/java/foreign/TestValueLayouts.java
+++ b/test/jdk/java/foreign/TestValueLayouts.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccess.java b/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccess.java
index 230b32968da..95125ec8779 100644
--- a/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccess.java
+++ b/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccessBase.java b/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccessBase.java
index 5f02e7cc4ac..a14fd5c12d2 100644
--- a/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccessBase.java
+++ b/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccessBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccessDynamic.java b/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccessDynamic.java
index f0a8d463a7f..2fccb2fa121 100644
--- a/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccessDynamic.java
+++ b/test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccessDynamic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/handles/Driver.java b/test/jdk/java/foreign/handles/Driver.java
index ca0545e2fd4..63528e19dcb 100644
--- a/test/jdk/java/foreign/handles/Driver.java
+++ b/test/jdk/java/foreign/handles/Driver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/handles/invoker_module/handle/invoker/MethodHandleInvoker.java b/test/jdk/java/foreign/handles/invoker_module/handle/invoker/MethodHandleInvoker.java
index fbb85cc54df..deb142d090b 100644
--- a/test/jdk/java/foreign/handles/invoker_module/handle/invoker/MethodHandleInvoker.java
+++ b/test/jdk/java/foreign/handles/invoker_module/handle/invoker/MethodHandleInvoker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/handles/lookup_module/handle/lookup/MethodHandleLookup.java b/test/jdk/java/foreign/handles/lookup_module/handle/lookup/MethodHandleLookup.java
index 42e6d7a7d84..f41cf59b07f 100644
--- a/test/jdk/java/foreign/handles/lookup_module/handle/lookup/MethodHandleLookup.java
+++ b/test/jdk/java/foreign/handles/lookup_module/handle/lookup/MethodHandleLookup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/stackwalk/TestAsyncStackWalk.java b/test/jdk/java/foreign/stackwalk/TestAsyncStackWalk.java
index 1c234a9c3c6..ee9f77cdfbc 100644
--- a/test/jdk/java/foreign/stackwalk/TestAsyncStackWalk.java
+++ b/test/jdk/java/foreign/stackwalk/TestAsyncStackWalk.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/stackwalk/TestReentrantUpcalls.java b/test/jdk/java/foreign/stackwalk/TestReentrantUpcalls.java
index 1d776aed128..2192d8ccde8 100644
--- a/test/jdk/java/foreign/stackwalk/TestReentrantUpcalls.java
+++ b/test/jdk/java/foreign/stackwalk/TestReentrantUpcalls.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/foreign/stackwalk/TestStackWalk.java b/test/jdk/java/foreign/stackwalk/TestStackWalk.java
index 193a71affdd..fe44a217f9a 100644
--- a/test/jdk/java/foreign/stackwalk/TestStackWalk.java
+++ b/test/jdk/java/foreign/stackwalk/TestStackWalk.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/io/File/TempDirDoesNotExist.java b/test/jdk/java/io/File/TempDirDoesNotExist.java
index f1c69f58654..89e9eb68d53 100644
--- a/test/jdk/java/io/File/TempDirDoesNotExist.java
+++ b/test/jdk/java/io/File/TempDirDoesNotExist.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java b/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java
index c9b757a7b51..44959eaea87 100644
--- a/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java
+++ b/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java
@@ -27,7 +27,6 @@
* @summary InvalidClassException is thrown when the canonical constructor
* cannot be found during deserialization.
* @library /test/lib
- * @enablePreview
* @run testng BadCanonicalCtrTest
*/
diff --git a/test/jdk/java/io/Serializable/records/ProhibitedMethods.java b/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
index 3a66e46f83b..d744e9ddbad 100644
--- a/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
+++ b/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
@@ -26,7 +26,6 @@
* @bug 8246774
* @summary Basic tests for prohibited magic serialization methods
* @library /test/lib
- * @enablePreview
* @run testng ProhibitedMethods
*/
diff --git a/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java b/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
index 12a5fe8c402..16266806850 100644
--- a/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
+++ b/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
@@ -26,7 +26,6 @@
* @bug 8246774
* @summary Basic tests for prohibited magic serialPersistentFields
* @library /test/lib
- * @enablePreview
* @run testng SerialPersistentFieldsTest
*/
diff --git a/test/jdk/java/lang/Class/getSimpleName/GetSimpleNameTest.java b/test/jdk/java/lang/Class/getSimpleName/GetSimpleNameTest.java
index d5fc282a45c..ce7e10a49e5 100644
--- a/test/jdk/java/lang/Class/getSimpleName/GetSimpleNameTest.java
+++ b/test/jdk/java/lang/Class/getSimpleName/GetSimpleNameTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
/* @test
* @bug 8057919
- * @summary Class.getSimpleName() should work for non-JLS compliant class names
* @enablePreview
+ * @summary Class.getSimpleName() should work for non-JLS compliant class names
*/
import java.lang.classfile.ClassBuilder;
diff --git a/test/jdk/java/lang/ModuleTests/AnnotationsTest.java b/test/jdk/java/lang/ModuleTests/AnnotationsTest.java
index f2c813e285d..44cbbdca321 100644
--- a/test/jdk/java/lang/ModuleTests/AnnotationsTest.java
+++ b/test/jdk/java/lang/ModuleTests/AnnotationsTest.java
@@ -49,7 +49,6 @@
/**
* @test
- * @enablePreview
* @modules java.base/jdk.internal.module
* @library /test/lib
* @run testng AnnotationsTest
diff --git a/test/jdk/java/lang/ProcessBuilder/CloseRace.java b/test/jdk/java/lang/ProcessBuilder/CloseRace.java
index b0ca352b8ac..44b79c665c0 100644
--- a/test/jdk/java/lang/ProcessBuilder/CloseRace.java
+++ b/test/jdk/java/lang/ProcessBuilder/CloseRace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/RuntimeTests/shutdown/ShutdownHooks.java b/test/jdk/java/lang/RuntimeTests/shutdown/ShutdownHooks.java
index 36d3878fb41..1f12a858b69 100644
--- a/test/jdk/java/lang/RuntimeTests/shutdown/ShutdownHooks.java
+++ b/test/jdk/java/lang/RuntimeTests/shutdown/ShutdownHooks.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/StackWalker/TestBCI.java b/test/jdk/java/lang/StackWalker/TestBCI.java
index 4d5e6a6eaf4..0379a0199c4 100644
--- a/test/jdk/java/lang/StackWalker/TestBCI.java
+++ b/test/jdk/java/lang/StackWalker/TestBCI.java
@@ -25,7 +25,6 @@
* @test
* @bug 8140450
* @summary Basic test for the StackWalker::getByteCodeIndex method
- * @enablePreview
* @run main TestBCI
*/
diff --git a/test/jdk/java/lang/String/StringRepeat.java b/test/jdk/java/lang/String/StringRepeat.java
index 11a0393766e..7eb6b244cd1 100644
--- a/test/jdk/java/lang/String/StringRepeat.java
+++ b/test/jdk/java/lang/String/StringRepeat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/StringBuilder/StringBufferRepeat.java b/test/jdk/java/lang/StringBuilder/StringBufferRepeat.java
index d78066fb417..00f4c82085c 100644
--- a/test/jdk/java/lang/StringBuilder/StringBufferRepeat.java
+++ b/test/jdk/java/lang/StringBuilder/StringBufferRepeat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java b/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java
index 882e0b881bc..c30193bc121 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/AnnotationTypeMismatchTest.java b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/AnnotationTypeMismatchTest.java
index 9c6bfabf82b..0dcff91d0fe 100644
--- a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/AnnotationTypeMismatchTest.java
+++ b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/AnnotationTypeMismatchTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8228988 8266598
* @summary An annotation-typed property of an annotation that is represented as an
* incompatible property of another type should yield an AnnotationTypeMismatchException.
- * @enablePreview
* @run main AnnotationTypeMismatchTest
*/
diff --git a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArityTypeMismatchTest.java b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArityTypeMismatchTest.java
index e8908b05ffa..5b1878bdeac 100644
--- a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArityTypeMismatchTest.java
+++ b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArityTypeMismatchTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary Annotation property which is compiled as an array property but
* changed observed as a singular element should throw an
* AnnotationTypeMismatchException
- * @enablePreview
* @run main ArityTypeMismatchTest
*/
diff --git a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArrayTypeMismatchTest.java b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArrayTypeMismatchTest.java
index 15897b1ca51..f8f70c7c074 100644
--- a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArrayTypeMismatchTest.java
+++ b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArrayTypeMismatchTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8266766
* @summary An array property of a type that is no longer of a type that is a legal member of an
* annotation should throw an AnnotationTypeMismatchException.
- * @enablePreview
* @run main ArrayTypeMismatchTest
*/
diff --git a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/EnumTypeMismatchTest.java b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/EnumTypeMismatchTest.java
index 43e62c66e9b..3eeebc68807 100644
--- a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/EnumTypeMismatchTest.java
+++ b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/EnumTypeMismatchTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8228988 8266598
* @summary An enumeration-typed property of an annotation that is represented as an
* incompatible property of another type should yield an AnnotationTypeMismatchException.
- * @enablePreview
* @run main EnumTypeMismatchTest
*/
diff --git a/test/jdk/java/lang/annotation/AnnotationVerifier.java b/test/jdk/java/lang/annotation/AnnotationVerifier.java
index 012f8ef2b1c..285cdf3d93e 100644
--- a/test/jdk/java/lang/annotation/AnnotationVerifier.java
+++ b/test/jdk/java/lang/annotation/AnnotationVerifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
* @bug 8158510
* @summary Verify valid annotation
* @modules java.base/sun.reflect.annotation
- * @enablePreview
* @clean AnnotationWithVoidReturn AnnotationWithParameter
* AnnotationWithExtraInterface AnnotationWithException
* AnnotationWithHashCode AnnotationWithDefaultMember
diff --git a/test/jdk/java/lang/annotation/ClassFileGenerator.java b/test/jdk/java/lang/annotation/ClassFileGenerator.java
index a7dbbcca58f..106109f3b01 100644
--- a/test/jdk/java/lang/annotation/ClassFileGenerator.java
+++ b/test/jdk/java/lang/annotation/ClassFileGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java b/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java
index 97cf4fde2f1..36f0b95d46f 100644
--- a/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java
+++ b/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java
@@ -38,8 +38,6 @@
* @library /test/lib
* @build bootreporter.StringIdCallback bootreporter.StringIdCallbackReporter
* asmlib.Instrumentor NativeMethodPrefixAgent
- * @enablePreview
- * @comment The test uses asmlib/Instrumentor.java which relies on ClassFile API PreviewFeature.
* @run main/native NativeMethodPrefixApp roleDriver
*/
public class NativeMethodPrefixApp implements StringIdCallback {
@@ -87,7 +85,6 @@ private static Path createAgentJar() throws Exception {
private static void launchApp(final Path agentJar) throws Exception {
final OutputAnalyzer oa = ProcessTools.executeTestJava(
- "--enable-preview", // due to usage of ClassFile API PreviewFeature in the agent
"-javaagent:" + agentJar.toString(),
"-Djava.library.path=" + testLibraryPath,
NativeMethodPrefixApp.class.getName());
diff --git a/test/jdk/java/lang/instrument/RetransformApp.java b/test/jdk/java/lang/instrument/RetransformApp.java
index 34be3d3ecd0..f6db7ebe7ae 100644
--- a/test/jdk/java/lang/instrument/RetransformApp.java
+++ b/test/jdk/java/lang/instrument/RetransformApp.java
@@ -38,8 +38,6 @@
* @library /test/lib
* @build jdk.test.lib.process.ProcessTools
* @build RetransformAgent asmlib.Instrumentor
- * @enablePreview
- * @comment The test uses asmlib/Instrumentor.java which relies on ClassFile API PreviewFeature.
* @run driver/timeout=240 RetransformApp roleDriver
* @comment The test uses a higher timeout to prevent test timeouts noted in JDK-6528548
*/
@@ -79,7 +77,6 @@ private static Path createAgentJar() throws Exception {
private static void launchApp(final Path agentJar) throws Exception {
final OutputAnalyzer oa = ProcessTools.executeTestJava(
- "--enable-preview", // due to usage of ClassFile API PreviewFeature in the agent
"-javaagent:" + agentJar.toString(),
RetransformApp.class.getName());
oa.shouldHaveExitValue(0);
diff --git a/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java b/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java
index 896e29439e9..23eb2ced6f4 100644
--- a/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java
+++ b/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java
@@ -25,7 +25,6 @@
* @test
* @bug 8022701
* @summary Illegal access exceptions via methodhandle invocations threw wrong error.
- * @enablePreview
* @compile -XDignore.symbol.file BogoLoader.java InvokeSeveralWays.java MHIllegalAccess.java MethodSupplier.java
* @run main/othervm MHIllegalAccess
*/
diff --git a/test/jdk/java/lang/invoke/BigArityTest.java b/test/jdk/java/lang/invoke/BigArityTest.java
index 2dba056a183..1a281bd1c75 100644
--- a/test/jdk/java/lang/invoke/BigArityTest.java
+++ b/test/jdk/java/lang/invoke/BigArityTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/DefineClassTest.java b/test/jdk/java/lang/invoke/DefineClassTest.java
index 65427c382d1..09a68ef71bc 100644
--- a/test/jdk/java/lang/invoke/DefineClassTest.java
+++ b/test/jdk/java/lang/invoke/DefineClassTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,8 +22,8 @@
*/
/* @test
- * @modules java.base/java.lang:open
* @enablePreview
+ * @modules java.base/java.lang:open
* @run testng/othervm test.DefineClassTest
* @summary Basic test for java.lang.invoke.MethodHandles.Lookup.defineClass
*/
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java b/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java
index cd013f9f543..c2ca4bb5682 100644
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
/*
* @test
* @bug 6983726 8206955 8269351
- * @enablePreview
* @summary Basic sanity tests for MethodHandleProxies
* @build BasicTest Client
* @run junit BasicTest
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java b/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java
index ff5eaf1b383..de563e58c65 100644
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
* @bug 6983726
* @library /test/lib
* @modules java.base/jdk.internal.misc
- * @enablePreview
* @summary Tests on implementation hidden classes spinned by MethodHandleProxies
* @build WrapperHiddenClassTest Client jdk.test.lib.util.ForceGC
* @run junit WrapperHiddenClassTest
diff --git a/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java b/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
index f51ecc4a2be..fdda19d8c01 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 8230501
* @library /test/lib
- * @enablePreview
* @run testng/othervm ClassDataTest
*/
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java
index 259bac823fa..59852da71b7 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
index b18655fcb03..78c13da45a9 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
index 808c3ec04cb..331b9073e90 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
index 5c3854b6068..908d61dd597 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
index a03a6248a0f..791510281c1 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
index 8324a488035..4188a51a559 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
index 20751c9d764..1ecfef0476e 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
index a79dbb3547e..c21709d6d37 100644
--- a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
+++ b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java b/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java
index 4ad03bb068a..38eedbd1dfa 100644
--- a/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java
+++ b/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 8022718
* @summary Runtime accessibility checking: protected class, if extended, should be accessible from another package
- * @enablePreview
* @compile -XDignore.symbol.file BogoLoader.java MethodInvoker.java Test.java anotherpkg/MethodSupplierOuter.java
* @run main/othervm Test
*/
diff --git a/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java
index 5cfad2e745c..d14a168d329 100644
--- a/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java
+++ b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java b/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java
index ad122fb003f..0357afce668 100644
--- a/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java
+++ b/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test bootstrap methods throwing an exception
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng BootstrapMethodJumboArgsTest
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 BootstrapMethodJumboArgsTest
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyBSMException.java b/test/jdk/java/lang/invoke/condy/CondyBSMException.java
index 67b5cb9af78..7aa25c5cd95 100644
--- a/test/jdk/java/lang/invoke/condy/CondyBSMException.java
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test bootstrap methods throwing an exception
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng CondyBSMException
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMException
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java b/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
index 8e63c676114..e9050126a79 100644
--- a/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046 8199875
* @summary Test basic invocation of bootstrap methods
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng CondyBSMInvocation
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMInvocation
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java b/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java
index de142a4af20..d255202866f 100644
--- a/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test invalid name in name and type
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng CondyBSMValidationTest
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMValidationTest
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java b/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java
index 86fe28d00e3..9fd35ed21f0 100644
--- a/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java
+++ b/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test for an interface using condy with default overpass methods
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng CondyInterfaceWithOverpassMethods
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyInterfaceWithOverpassMethods
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java b/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java
index d9ac3dd0fee..6178b85236b 100644
--- a/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test invalid name in name and type
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng CondyNameValidationTest
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyNameValidationTest
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyNestedTest.java b/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
index 2cdbff4ffdd..8eb71ec93a3 100644
--- a/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test nested dynamic constant declarations that are recursive
* @compile CondyNestedTest_Code.jcod
- * @enablePreview
* @run testng CondyNestedTest
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyNestedTest
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java b/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
index f635bbfd59b..7ef5c610150 100644
--- a/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
+++ b/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186211
* @summary Test basic invocation of multiple ldc's of the same dynamic constant that fail resolution
* @library /java/lang/invoke/common
- * @enablePreview
* @run testng CondyRepeatFailedResolution
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyRepeatFailedResolution
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java b/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
index 057d5405516..d6c0748c97c 100644
--- a/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 8186046
* @summary Test for condy BSMs returning primitive values or null
- * @enablePreview
* @run testng CondyReturnPrimitiveTest
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyReturnPrimitiveTest
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java b/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java
index e6f25b24443..ba3d0e81488 100644
--- a/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test bootstrap arguments for condy
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng CondyStaticArgumentsTest
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyStaticArgumentsTest
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java b/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java
index 01007235689..c44179ce13c 100644
--- a/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test invalid name in name and type
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyTypeValidationTest
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java b/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java
index 6c0776e757e..5e301a193dd 100644
--- a/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Stress test ldc to ensure HotSpot correctly manages oop maps
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng CondyWithGarbageTest
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyWithGarbageTest
*/
diff --git a/test/jdk/java/lang/invoke/condy/CondyWrongType.java b/test/jdk/java/lang/invoke/condy/CondyWrongType.java
index 0e61e350b0b..42c69e8ab7d 100644
--- a/test/jdk/java/lang/invoke/condy/CondyWrongType.java
+++ b/test/jdk/java/lang/invoke/condy/CondyWrongType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046
* @summary Test bootstrap methods returning the wrong type
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng CondyWrongType
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyWrongType
*/
diff --git a/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java b/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
index d05be23d0ad..640affeec5c 100644
--- a/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
+++ b/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8186046 8195694
* @summary Test dynamic constant bootstraps
* @library /java/lang/invoke/common
- * @enablePreview
+ * @build test.java.lang.invoke.lib.InstructionHelper
* @run testng ConstantBootstrapsTest
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 ConstantBootstrapsTest
*/
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
index 701458cd3c4..75ee9b26553 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
@@ -26,8 +26,6 @@
* @bug 8330467
* @modules jdk.compiler
* @library /test/lib
- * @enablePreview
- * @comment Change enablePreview with the flag in setup's compileSources
* @compile BadClassFile.jcod
* BadClassFile2.jcod
* BadClassFileVersion.jcod
@@ -80,8 +78,7 @@ public class BasicTest {
@BeforeTest
static void setup() throws IOException {
- compileSources(SRC_DIR, CLASSES_DIR, "--enable-preview",
- "--release", Integer.toString(Runtime.version().feature()));
+ compileSources(SRC_DIR, CLASSES_DIR);
hiddenClassBytes = Files.readAllBytes(CLASSES_DIR.resolve("HiddenClass.class"));
// compile with --release 10 with no NestHost and NestMembers attribute
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java
index 9043ce0fd85..e026a7a1387 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
/*
* @test
* @library /test/lib
- * @enablePreview
* @build HiddenNestmateTest
* @run testng/othervm HiddenNestmateTest
*/
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
index 90fa01ca2c9..3b572c6581b 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java
index e7306745d68..221a1d7d5f2 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,8 @@
* @test
* @bug 8266925
* @summary hidden class members can't be statically invocable
- * @modules java.base/jdk.internal.misc
* @enablePreview
+ * @modules java.base/jdk.internal.misc
* @build java.base/*
* @run testng StaticInvocableTest
*/
diff --git a/test/jdk/java/lang/invoke/lambda/LambdaAsm.java b/test/jdk/java/lang/invoke/lambda/LambdaAsm.java
index 76d091cc51d..a379c809b87 100644
--- a/test/jdk/java/lang/invoke/lambda/LambdaAsm.java
+++ b/test/jdk/java/lang/invoke/lambda/LambdaAsm.java
@@ -26,7 +26,6 @@
* @bug 8027232
* @library /test/lib/
* @modules jdk.zipfs
- * @enablePreview
* @compile LambdaAsm.java
* @run main/othervm LambdaAsm
* @summary ensures that j.l.i.InvokerByteCodeGenerator and Class-File API
diff --git a/test/jdk/java/lang/invoke/lambda/LambdaStackTrace.java b/test/jdk/java/lang/invoke/lambda/LambdaStackTrace.java
index 0aa6d542588..54e9b7efe3f 100644
--- a/test/jdk/java/lang/invoke/lambda/LambdaStackTrace.java
+++ b/test/jdk/java/lang/invoke/lambda/LambdaStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8025636
* @library /test/lib/
* @modules jdk.compiler
- * @enablePreview
* @compile LambdaStackTrace.java
* @run main LambdaStackTrace
* @summary Synthetic frames should be hidden in exceptions
diff --git a/test/jdk/java/lang/invoke/lookup/SpecialStatic.java b/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
index 8ca9f58eb57..bbf4210ee5d 100644
--- a/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
+++ b/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java b/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java
index f8abba43983..699be54ec89 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/module/ClassFileVersionsTest.java b/test/jdk/java/lang/module/ClassFileVersionsTest.java
index 11f2819c744..1c3a322cdc3 100644
--- a/test/jdk/java/lang/module/ClassFileVersionsTest.java
+++ b/test/jdk/java/lang/module/ClassFileVersionsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
/**
* @test
- * @enablePreview
* @modules java.base/jdk.internal.module
* @library /test/lib
* @run testng ClassFileVersionsTest
diff --git a/test/jdk/java/lang/module/ConfigurationTest.java b/test/jdk/java/lang/module/ConfigurationTest.java
index d9ee7e521fc..880084fd98d 100644
--- a/test/jdk/java/lang/module/ConfigurationTest.java
+++ b/test/jdk/java/lang/module/ConfigurationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
/**
* @test
- * @enablePreview
* @modules java.base/jdk.internal.access
* java.base/jdk.internal.module
* @library /test/lib
diff --git a/test/jdk/java/lang/module/ModuleDescriptorTest.java b/test/jdk/java/lang/module/ModuleDescriptorTest.java
index 0e27953f385..29eba2de75f 100644
--- a/test/jdk/java/lang/module/ModuleDescriptorTest.java
+++ b/test/jdk/java/lang/module/ModuleDescriptorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
/**
* @test
* @bug 8142968 8158456 8298875
- * @enablePreview
* @modules java.base/jdk.internal.access
* java.base/jdk.internal.module
* @library /test/lib
diff --git a/test/jdk/java/lang/module/ModuleFinderTest.java b/test/jdk/java/lang/module/ModuleFinderTest.java
index c1182289a4d..2e2e6119293 100644
--- a/test/jdk/java/lang/module/ModuleFinderTest.java
+++ b/test/jdk/java/lang/module/ModuleFinderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
/**
* @test
- * @enablePreview
* @modules java.base/jdk.internal.module
* @library /test/lib
* @build ModuleFinderTest
diff --git a/test/jdk/java/lang/module/ModuleNamesTest.java b/test/jdk/java/lang/module/ModuleNamesTest.java
index 8ce69c905d9..3009db7fce3 100644
--- a/test/jdk/java/lang/module/ModuleNamesTest.java
+++ b/test/jdk/java/lang/module/ModuleNamesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
/**
* @test
- * @enablePreview
* @modules java.base/jdk.internal.access
* java.base/jdk.internal.module
* @library /test/lib
diff --git a/test/jdk/java/lang/module/MultiReleaseJarTest.java b/test/jdk/java/lang/module/MultiReleaseJarTest.java
index 42d1921ea87..ec2690cf3ab 100644
--- a/test/jdk/java/lang/module/MultiReleaseJarTest.java
+++ b/test/jdk/java/lang/module/MultiReleaseJarTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
/**
* @test
- * @enablePreview
* @modules java.base/jdk.internal.module
* @library /test/lib
* @build MultiReleaseJarTest
diff --git a/test/jdk/java/lang/ref/Basic.java b/test/jdk/java/lang/ref/Basic.java
index abed7fdcd64..02133e170ad 100644
--- a/test/jdk/java/lang/ref/Basic.java
+++ b/test/jdk/java/lang/ref/Basic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/lang/reflect/Generics/TestMissingTypeVariable.java b/test/jdk/java/lang/reflect/Generics/TestMissingTypeVariable.java
index 64f1457bdf7..426b005a4cc 100644
--- a/test/jdk/java/lang/reflect/Generics/TestMissingTypeVariable.java
+++ b/test/jdk/java/lang/reflect/Generics/TestMissingTypeVariable.java
@@ -25,7 +25,6 @@
* @test
* @library /test/lib
* @bug 8337302
- * @enablePreview
* @summary Tests that an exception is thrown if a type variable is not declared
*/
diff --git a/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java b/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
index 2b19189ceed..e8077d5a66f 100644
--- a/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
+++ b/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8026213
* @summary Reflection support for private methods in interfaces
* @author Robert Field
- * @enablePreview
* @run main TestPrivateInterfaceMethodReflect
*/
diff --git a/test/jdk/java/lang/reflect/records/IsRecordTest.java b/test/jdk/java/lang/reflect/records/IsRecordTest.java
index 799f1d75e18..0c4c7652275 100644
--- a/test/jdk/java/lang/reflect/records/IsRecordTest.java
+++ b/test/jdk/java/lang/reflect/records/IsRecordTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 8255560 8326879
* @summary Class::isRecord should check that the current class is final and not abstract
- * @enablePreview
* @library /test/lib
* @run testng/othervm IsRecordTest
* @run testng/othervm --enable-preview IsRecordTest
diff --git a/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java b/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java
index 8c862ae729b..6e1ef8e4c9f 100644
--- a/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java
+++ b/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java
@@ -44,8 +44,6 @@
* @test
* @bug 8304487
* @summary Verify boundary and special cases of exact conversion predicates
- * @enablePreview
- * @modules java.base/jdk.internal.classfile
* @compile ExactnessConversionsSupportTest.java
* @run testng/othervm ExactnessConversionsSupportTest
*/
diff --git a/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java b/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
index 4d79f62a01d..b21c16c4ba0 100644
--- a/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
+++ b/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@
* @test
* @bug 8318144
* @enablePreview
- * @modules java.base/jdk.internal.classfile
* @compile SwitchBootstrapsTest.java
* @run testng/othervm SwitchBootstrapsTest
*/
diff --git a/test/jdk/java/math/BigInteger/HashCode.java b/test/jdk/java/math/BigInteger/HashCode.java
index ecd3b8f368e..9a9a41fce7e 100644
--- a/test/jdk/java/math/BigInteger/HashCode.java
+++ b/test/jdk/java/math/BigInteger/HashCode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/BodySubscribersTest.java b/test/jdk/java/net/httpclient/BodySubscribersTest.java
index 5ee7ed4ef62..21aa4ce3b17 100644
--- a/test/jdk/java/net/httpclient/BodySubscribersTest.java
+++ b/test/jdk/java/net/httpclient/BodySubscribersTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/GZIPInputStreamTest.java b/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
index 7db41cde5d6..1215fc6c0a0 100644
--- a/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
+++ b/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/MaxStreams.java b/test/jdk/java/net/httpclient/MaxStreams.java
index e44981e0a58..25ec39ac472 100644
--- a/test/jdk/java/net/httpclient/MaxStreams.java
+++ b/test/jdk/java/net/httpclient/MaxStreams.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/RedirectTimeoutTest.java b/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
index f549898386c..88b8fd964b0 100644
--- a/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
+++ b/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/http2/ExpectContinueResetTest.java b/test/jdk/java/net/httpclient/http2/ExpectContinueResetTest.java
index b733eb180eb..68012208281 100644
--- a/test/jdk/java/net/httpclient/http2/ExpectContinueResetTest.java
+++ b/test/jdk/java/net/httpclient/http2/ExpectContinueResetTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/http2/PushPromiseContinuation.java b/test/jdk/java/net/httpclient/http2/PushPromiseContinuation.java
index c0021e7e4ea..1f9340c5c08 100644
--- a/test/jdk/java/net/httpclient/http2/PushPromiseContinuation.java
+++ b/test/jdk/java/net/httpclient/http2/PushPromiseContinuation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/HpackTestEncoder.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/HpackTestEncoder.java
index f54a4a766b8..20869aa89e6 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/HpackTestEncoder.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/HpackTestEncoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestExchangeImpl.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestExchangeImpl.java
index fa7589c0232..12324b3ba0b 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestExchangeImpl.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestExchangeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java
index e6897a83de4..00b261292fa 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/Basic-X.java.template b/test/jdk/java/nio/Buffer/Basic-X.java.template
index 4cd61ea8043..c53b653f017 100644
--- a/test/jdk/java/nio/Buffer/Basic-X.java.template
+++ b/test/jdk/java/nio/Buffer/Basic-X.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/BasicByte.java b/test/jdk/java/nio/Buffer/BasicByte.java
index 05bf8e523bb..6f913a88c52 100644
--- a/test/jdk/java/nio/Buffer/BasicByte.java
+++ b/test/jdk/java/nio/Buffer/BasicByte.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/BasicChar.java b/test/jdk/java/nio/Buffer/BasicChar.java
index 8d6cfd1eecf..7290a09d6d0 100644
--- a/test/jdk/java/nio/Buffer/BasicChar.java
+++ b/test/jdk/java/nio/Buffer/BasicChar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/BasicDouble.java b/test/jdk/java/nio/Buffer/BasicDouble.java
index 4b1cde85a08..a9b71ba1842 100644
--- a/test/jdk/java/nio/Buffer/BasicDouble.java
+++ b/test/jdk/java/nio/Buffer/BasicDouble.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/BasicFloat.java b/test/jdk/java/nio/Buffer/BasicFloat.java
index 654dfe72fbe..2561f7173fc 100644
--- a/test/jdk/java/nio/Buffer/BasicFloat.java
+++ b/test/jdk/java/nio/Buffer/BasicFloat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/BasicInt.java b/test/jdk/java/nio/Buffer/BasicInt.java
index 4e1b8a237b4..22f33a27f58 100644
--- a/test/jdk/java/nio/Buffer/BasicInt.java
+++ b/test/jdk/java/nio/Buffer/BasicInt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/BasicLong.java b/test/jdk/java/nio/Buffer/BasicLong.java
index 02b30e879b6..553e3ebe549 100644
--- a/test/jdk/java/nio/Buffer/BasicLong.java
+++ b/test/jdk/java/nio/Buffer/BasicLong.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/BasicShort.java b/test/jdk/java/nio/Buffer/BasicShort.java
index 22c6dd4b59d..b4508babacf 100644
--- a/test/jdk/java/nio/Buffer/BasicShort.java
+++ b/test/jdk/java/nio/Buffer/BasicShort.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/LimitDirectMemory.java b/test/jdk/java/nio/Buffer/LimitDirectMemory.java
index 2116a20748d..49ac8c18469 100644
--- a/test/jdk/java/nio/Buffer/LimitDirectMemory.java
+++ b/test/jdk/java/nio/Buffer/LimitDirectMemory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/Buffer/UnmeteredTempBuffers.java b/test/jdk/java/nio/Buffer/UnmeteredTempBuffers.java
new file mode 100644
index 00000000000..25249b7f7d6
--- /dev/null
+++ b/test/jdk/java/nio/Buffer/UnmeteredTempBuffers.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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 8344882
+ * @summary Deallocation failure for temporary buffers
+ * @run junit/othervm -XX:MaxDirectMemorySize=32768 UnmeteredTempBuffers
+ */
+import java.io.InputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import static java.nio.file.StandardOpenOption.*;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UnmeteredTempBuffers {
+ @ParameterizedTest
+ @ValueSource(ints = {16384, 32768, 32769, 65536})
+ void testFileChannel(int cap) throws IOException {
+ Path file = Files.createTempFile("prefix", "suffix");
+ try (FileChannel ch = FileChannel.open(file, WRITE, DELETE_ON_CLOSE)) {
+ ByteBuffer buf = ByteBuffer.wrap(new byte[cap]);
+ try {
+ ch.write(buf);
+ } catch (OutOfMemoryError oome) {
+ throw new RuntimeException(oome);
+ }
+ } finally {
+ Files.deleteIfExists(file);
+ }
+ }
+
+ @ParameterizedTest
+ @ValueSource(ints = {16384, 32768, 32769, 65536})
+ void testInputStream(int cap) throws IOException {
+ Path file = Files.createTempFile("prefix", "suffix");
+ try {
+ byte[] bytes = new byte[cap];
+ Files.write(file, bytes);
+ try (InputStream in = Files.newInputStream(file)) {
+ in.read(bytes);
+ } catch (OutOfMemoryError oome) {
+ throw new RuntimeException(oome);
+ }
+ } finally {
+ Files.delete(file);
+ }
+ }
+}
diff --git a/test/jdk/java/nio/channels/DatagramChannel/SelectWhenRefused.java b/test/jdk/java/nio/channels/DatagramChannel/SelectWhenRefused.java
index 58ccf9d0b80..f37d4621b54 100644
--- a/test/jdk/java/nio/channels/DatagramChannel/SelectWhenRefused.java
+++ b/test/jdk/java/nio/channels/DatagramChannel/SelectWhenRefused.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/nio/channels/Selector/WakeupNow.java b/test/jdk/java/nio/channels/Selector/WakeupNow.java
index a8d1222ba13..4f14da29b78 100644
--- a/test/jdk/java/nio/channels/Selector/WakeupNow.java
+++ b/test/jdk/java/nio/channels/Selector/WakeupNow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/security/KeyStore/CheckMacOSKeyChainTrust.java b/test/jdk/java/security/KeyStore/CheckMacOSKeyChainTrust.java
index 20b6b312cab..391849f9371 100644
--- a/test/jdk/java/security/KeyStore/CheckMacOSKeyChainTrust.java
+++ b/test/jdk/java/security/KeyStore/CheckMacOSKeyChainTrust.java
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/jdk/java/security/Provider/SecurityProviderModularTest.java b/test/jdk/java/security/Provider/SecurityProviderModularTest.java
index 09d352d37c4..bb060192c29 100644
--- a/test/jdk/java/security/Provider/SecurityProviderModularTest.java
+++ b/test/jdk/java/security/Provider/SecurityProviderModularTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
* @bug 8130360 8183310
* @summary Test security provider in different combination of modular option
* defined with(out) service description.
- * @enablePreview
* @modules java.base/jdk.internal.module
* @library /test/lib
* @build jdk.test.lib.util.JarUtils
diff --git a/test/jdk/java/text/Format/MessageFormat/MessageFormatExceptions.java b/test/jdk/java/text/Format/MessageFormat/MessageFormatExceptions.java
index 276f49a07d7..59444569725 100644
--- a/test/jdk/java/text/Format/MessageFormat/MessageFormatExceptions.java
+++ b/test/jdk/java/text/Format/MessageFormat/MessageFormatExceptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java b/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java
index b76848e4bb1..6a63fc46226 100644
--- a/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java
+++ b/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java
@@ -35,7 +35,6 @@
* @bug 8187987
* @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
* @library /tools/lib /test/lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jimage
* jdk.compiler
diff --git a/test/jdk/java/util/Arrays/HashCode.java b/test/jdk/java/util/Arrays/HashCode.java
index c2c9ca1b23b..f821abcb1ff 100644
--- a/test/jdk/java/util/Arrays/HashCode.java
+++ b/test/jdk/java/util/Arrays/HashCode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle, Inc. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle, 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
diff --git a/test/jdk/java/util/Collection/MOAT.java b/test/jdk/java/util/Collection/MOAT.java
index 0e5eadc9799..d281e5db125 100644
--- a/test/jdk/java/util/Collection/MOAT.java
+++ b/test/jdk/java/util/Collection/MOAT.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/Currency/PropertiesTestRun.java b/test/jdk/java/util/Currency/PropertiesTestRun.java
index baec22f3e86..53386c9d5c1 100644
--- a/test/jdk/java/util/Currency/PropertiesTestRun.java
+++ b/test/jdk/java/util/Currency/PropertiesTestRun.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/Formatter/Basic.java b/test/jdk/java/util/Formatter/Basic.java
index 4c8e3dfdf8b..e70d9ca753f 100644
--- a/test/jdk/java/util/Formatter/Basic.java
+++ b/test/jdk/java/util/Formatter/Basic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/Locale/UseOldISOCodesTest.java b/test/jdk/java/util/Locale/UseOldISOCodesTest.java
index 01f997a743d..0e11eb27033 100644
--- a/test/jdk/java/util/Locale/UseOldISOCodesTest.java
+++ b/test/jdk/java/util/Locale/UseOldISOCodesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/ServiceLoader/BadProvidersTest.java b/test/jdk/java/util/ServiceLoader/BadProvidersTest.java
index a643fa21576..ce1942a952d 100644
--- a/test/jdk/java/util/ServiceLoader/BadProvidersTest.java
+++ b/test/jdk/java/util/ServiceLoader/BadProvidersTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,9 @@
/**
* @test
+ * @enablePreview
* @library /test/lib
* @modules jdk.compiler
- * @enablePreview
* @build jdk.test.lib.compiler.CompilerUtils
* @run testng/othervm BadProvidersTest
* @summary Basic test of ServiceLoader with bad provider and bad provider
diff --git a/test/jdk/java/util/concurrent/StructuredTaskScope/WithScopedValue.java b/test/jdk/java/util/concurrent/StructuredTaskScope/WithScopedValue.java
index e119756d916..dcb375a80a5 100644
--- a/test/jdk/java/util/concurrent/StructuredTaskScope/WithScopedValue.java
+++ b/test/jdk/java/util/concurrent/StructuredTaskScope/WithScopedValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/concurrent/SynchronousQueue/Fairness.java b/test/jdk/java/util/concurrent/SynchronousQueue/Fairness.java
index 3662fd74609..1e5a493306d 100644
--- a/test/jdk/java/util/concurrent/SynchronousQueue/Fairness.java
+++ b/test/jdk/java/util/concurrent/SynchronousQueue/Fairness.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/prefs/CheckUserPrefsStorage.java b/test/jdk/java/util/prefs/CheckUserPrefsStorage.java
index 1f772f4811a..bf7459f3e16 100644
--- a/test/jdk/java/util/prefs/CheckUserPrefsStorage.java
+++ b/test/jdk/java/util/prefs/CheckUserPrefsStorage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/stream/GathererAPITest.java b/test/jdk/java/util/stream/GathererAPITest.java
index 364d3065acb..93e8782a639 100644
--- a/test/jdk/java/util/stream/GathererAPITest.java
+++ b/test/jdk/java/util/stream/GathererAPITest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/stream/GathererTest.java b/test/jdk/java/util/stream/GathererTest.java
index 7a03c0b35ed..ca22fc21236 100644
--- a/test/jdk/java/util/stream/GathererTest.java
+++ b/test/jdk/java/util/stream/GathererTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/stream/GatherersFoldTest.java b/test/jdk/java/util/stream/GatherersFoldTest.java
index 0e0535882f9..1365bcd5f55 100644
--- a/test/jdk/java/util/stream/GatherersFoldTest.java
+++ b/test/jdk/java/util/stream/GatherersFoldTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/stream/GatherersMapConcurrentTest.java b/test/jdk/java/util/stream/GatherersMapConcurrentTest.java
index f7cc1c42a3c..557598de3ee 100644
--- a/test/jdk/java/util/stream/GatherersMapConcurrentTest.java
+++ b/test/jdk/java/util/stream/GatherersMapConcurrentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/stream/GatherersScanTest.java b/test/jdk/java/util/stream/GatherersScanTest.java
index 51b7c0ef0eb..36024c16c57 100644
--- a/test/jdk/java/util/stream/GatherersScanTest.java
+++ b/test/jdk/java/util/stream/GatherersScanTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/stream/GatherersWindowFixedTest.java b/test/jdk/java/util/stream/GatherersWindowFixedTest.java
index cddfee1b098..df77d3bd562 100644
--- a/test/jdk/java/util/stream/GatherersWindowFixedTest.java
+++ b/test/jdk/java/util/stream/GatherersWindowFixedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/stream/GatherersWindowSlidingTest.java b/test/jdk/java/util/stream/GatherersWindowSlidingTest.java
index 29ffa54e882..09b680a5d8b 100644
--- a/test/jdk/java/util/stream/GatherersWindowSlidingTest.java
+++ b/test/jdk/java/util/stream/GatherersWindowSlidingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java
index 07348841b1e..2a38c000cce 100644
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/zip/DataDescriptorIgnoreCrcAndSizeFields.java b/test/jdk/java/util/zip/DataDescriptorIgnoreCrcAndSizeFields.java
index 67e495ffb4d..4f9002b497f 100644
--- a/test/jdk/java/util/zip/DataDescriptorIgnoreCrcAndSizeFields.java
+++ b/test/jdk/java/util/zip/DataDescriptorIgnoreCrcAndSizeFields.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/zip/GZIP/GZIPInputStreamAvailable.java b/test/jdk/java/util/zip/GZIP/GZIPInputStreamAvailable.java
index 1468c104fcf..f63015e0930 100644
--- a/test/jdk/java/util/zip/GZIP/GZIPInputStreamAvailable.java
+++ b/test/jdk/java/util/zip/GZIP/GZIPInputStreamAvailable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/java/util/zip/ZipFile/DeleteTempJarTest.java b/test/jdk/java/util/zip/ZipFile/DeleteTempJarTest.java
index cafc17accf8..180e9ab5cbc 100644
--- a/test/jdk/java/util/zip/ZipFile/DeleteTempJarTest.java
+++ b/test/jdk/java/util/zip/ZipFile/DeleteTempJarTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatThreadTest.java b/test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatThreadTest.java
index ef39bb74115..1f0d438f44f 100644
--- a/test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatThreadTest.java
+++ b/test/jdk/javax/imageio/metadata/IIOMetadataFormat/MetadataFormatThreadTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/javax/management/remote/mandatory/loading/MissingClassTest.java b/test/jdk/javax/management/remote/mandatory/loading/MissingClassTest.java
index 516c30c60a8..08598315dc3 100644
--- a/test/jdk/javax/management/remote/mandatory/loading/MissingClassTest.java
+++ b/test/jdk/javax/management/remote/mandatory/loading/MissingClassTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java b/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java
index 106b42d6fde..07002519ddb 100644
--- a/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java
+++ b/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
* @test
* @bug 8078813 8183310
* @summary Test custom JAAS login module with all possible modular option.
- * @enablePreview
* @modules java.base/jdk.internal.module
* @library /test/lib
* @build jdk.test.lib.util.JarUtils
diff --git a/test/jdk/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java b/test/jdk/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java
index c91e7c22ccc..3b1ea5c54d2 100644
--- a/test/jdk/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java
+++ b/test/jdk/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/javax/sound/midi/File/SMFInterruptedRunningStatus.java b/test/jdk/javax/sound/midi/File/SMFInterruptedRunningStatus.java
index 8aac012b455..04267af8d8c 100644
--- a/test/jdk/javax/sound/midi/File/SMFInterruptedRunningStatus.java
+++ b/test/jdk/javax/sound/midi/File/SMFInterruptedRunningStatus.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/javax/sound/sampled/Lines/GetLine.java b/test/jdk/javax/sound/sampled/Lines/GetLine.java
index e31c5ac8d6f..27f33414ed2 100644
--- a/test/jdk/javax/sound/sampled/Lines/GetLine.java
+++ b/test/jdk/javax/sound/sampled/Lines/GetLine.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/javax/swing/AbstractButton/5049549/bug5049549.java b/test/jdk/javax/swing/AbstractButton/5049549/bug5049549.java
index c24435eb18c..a2c53528116 100644
--- a/test/jdk/javax/swing/AbstractButton/5049549/bug5049549.java
+++ b/test/jdk/javax/swing/AbstractButton/5049549/bug5049549.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/javax/swing/JFrame/JFrameBackgroundRefreshTest.java b/test/jdk/javax/swing/JFrame/JFrameBackgroundRefreshTest.java
index cb2e0051216..9491ae49d28 100644
--- a/test/jdk/javax/swing/JFrame/JFrameBackgroundRefreshTest.java
+++ b/test/jdk/javax/swing/JFrame/JFrameBackgroundRefreshTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java b/test/jdk/javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java
index ced7410bf06..4f0857944aa 100644
--- a/test/jdk/javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java
+++ b/test/jdk/javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@ public class JSplitPaneKeyboardNavigationTest {
public static void main(String[] s) throws Exception {
robot = new Robot();
robot.setAutoWaitForIdle(true);
- robot.setAutoDelay(200);
+ robot.setAutoDelay(100);
List<String> lafs = Arrays.stream(getInstalledLookAndFeels())
.map(LookAndFeelInfo::getClassName)
.collect(Collectors.toList());
@@ -81,10 +81,13 @@ public static void main(String[] s) throws Exception {
continue;
}
robot.waitForIdle();
+ robot.delay(1000);
// Press Right button 1 and move focus to it.
pressButton(rightButton1);
hitKeys(KeyEvent.VK_F6);
+ robot.waitForIdle();
+ robot.delay(100);
// Verifier1 - Verifies that, F6 transfers focus to the right/bottom side of the splitpane
if (isFocusOwner(rightButton2)) {
@@ -98,9 +101,12 @@ public static void main(String[] s) throws Exception {
// Press Right button 2 and move focus to it.
pressButton(rightButton2);
hitKeys(KeyEvent.VK_F6);
+ robot.waitForIdle();
+ robot.delay(100);
// Verifier2 - Verifies that, F6 transfers focus to the left side of the parent splitpane,
- // if the right/bottom side of splitpane already has focus, and it is contained within another splitpane
+ // if the right/bottom side of splitpane already has focus,
+ // and it is contained within another splitpane
if (isFocusOwner(leftButton)) {
System.out.println("Verifier 2 passed");
} else {
@@ -112,6 +118,9 @@ public static void main(String[] s) throws Exception {
// Press Left button and move focus to it.
pressButton(leftButton);
hitKeys(KeyEvent.VK_CONTROL, KeyEvent.VK_TAB);
+ robot.waitForIdle();
+ robot.delay(100);
+
// Verifier3 - Verifies that, CTRL-TAB navigates forward outside the JSplitPane
if (isFocusOwner(bottomButton)) {
System.out.println("Verifier 3 passed");
@@ -124,6 +133,8 @@ public static void main(String[] s) throws Exception {
// Press Left button and move focus to it.
pressButton(leftButton);
hitKeys(KeyEvent.VK_CONTROL, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
+ robot.waitForIdle();
+ robot.delay(100);
// Verifier4 - Verifies that, CTRL-SHIFT-TAB navigates backward outside the JSplitPane
if (isFocusOwner(topButton)) {
@@ -137,7 +148,8 @@ public static void main(String[] s) throws Exception {
if (failedVerifiers.toString().isEmpty()) {
System.out.println("Test passed, All verifiers succeeded for " + laf);
} else {
- throw new RuntimeException("Test failed, verifiers " + failedVerifiers.toString() + " failed for " + laf);
+ throw new RuntimeException("Test failed, verifiers "
+ + failedVerifiers.toString() + " failed for " + laf);
}
} finally {
SwingUtilities.invokeAndWait(JSplitPaneKeyboardNavigationTest::disposeFrame);
@@ -159,13 +171,14 @@ private static void pressButton(JButton button) throws Exception {
loc.set(button.getLocationOnScreen());
});
final Point buttonLoc = loc.get();
- robot.mouseMove(buttonLoc.x + 8, buttonLoc.y + 8);
+ robot.mouseMove(buttonLoc.x + button.getWidth() / 2,
+ buttonLoc.y + button.getHeight() / 2);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
}
public static void createUI() {
- frame = new JFrame();
+ frame = new JFrame("JSplitPaneKeyboardNavigationTest");
panel = new JPanel();
panel.setLayout(new BorderLayout());
leftButton = new JButton("Left Button");
@@ -175,13 +188,14 @@ public static void createUI() {
bottomButton = new JButton("Bottom Button");
panel.add(topButton, BorderLayout.NORTH);
panel.add(bottomButton, BorderLayout.SOUTH);
- final JSplitPane splitPane2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, rightButton1, rightButton2);
- final JSplitPane splitPane1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, leftButton, splitPane2);
+ final JSplitPane splitPane2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
+ true, rightButton1, rightButton2);
+ final JSplitPane splitPane1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+ true, leftButton, splitPane2);
panel.add(splitPane1, BorderLayout.CENTER);
frame.setContentPane(panel);
frame.setSize(200, 200);
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
- frame.pack();
frame.setAlwaysOnTop(true);
frame.setLocationRelativeTo(null);
frame.setVisible(true);
@@ -213,7 +227,6 @@ private static boolean setLookAndFeel(String lafName) {
private static void disposeFrame() {
if (frame != null) {
frame.dispose();
- frame = null;
}
}
diff --git a/test/jdk/javax/swing/JTable/TestCaretArtifact.java b/test/jdk/javax/swing/JTable/TestCaretArtifact.java
new file mode 100644
index 00000000000..98e174315a9
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/TestCaretArtifact.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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 8268145
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @requires (os.family == "mac")
+ * @summary Verify rendering artifact is not seen moving caret inside
+ * JTable with TableCellEditor having JTextField
+ * @run main/manual TestCaretArtifact
+ */
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.JFrame;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableColumn;
+import javax.swing.SwingUtilities;
+
+public class TestCaretArtifact {
+
+ private static final String INSTRUCTIONS = """
+ Double click on "Click Here" textfield so that textfield becomes editable;
+ Press spacebar. Press left arrow button.
+ Do this few times.
+ If artifact is seen, press Fail else press Pass.""";
+
+ public static void main(String[] args) throws Exception {
+ PassFailJFrame.builder()
+ .title("Caret Artifact Instructions")
+ .instructions(INSTRUCTIONS)
+ .columns(35)
+ .testUI(TestCaretArtifact::createUI)
+ .build()
+ .awaitAndCheck();
+ }
+
+
+ public static JFrame createUI() {
+ TableCellEditor editor = new TestEditor(new JTextField());
+ JTable table = new JTable(new Object[][] {{"click here",
+ "inactive forever"}},
+ new Object[] {"1", "2"});
+
+ JFrame frame = new JFrame("CaretArtifact");
+ TableColumn column = table.getColumn("1");
+ column.setCellEditor(editor);
+ frame.getContentPane().add("Center", table);
+ frame.setSize(400, 100);
+
+ return frame;
+ }
+
+ static class TestEditor extends DefaultCellEditor {
+ public TestEditor(JTextField tf) {
+ super(tf);
+ }
+ public boolean stopCellEditing() {
+ return false;
+ }
+ }
+}
+
diff --git a/test/jdk/javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java b/test/jdk/javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java
index 77fac43d262..eadd04f5d8b 100644
--- a/test/jdk/javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java
+++ b/test/jdk/javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/classfile/AdaptCodeTest.java b/test/jdk/jdk/classfile/AdaptCodeTest.java
index 80c526c63c7..82967b9fbd0 100644
--- a/test/jdk/jdk/classfile/AdaptCodeTest.java
+++ b/test/jdk/jdk/classfile/AdaptCodeTest.java
@@ -24,6 +24,7 @@
/*
* @test
* @summary Testing ClassFile Code Adaptation.
+ * @enablePreview
* @run junit AdaptCodeTest
*/
diff --git a/test/jdk/jdk/classfile/AnnotationModelTest.java b/test/jdk/jdk/classfile/AnnotationModelTest.java
index 25d02b8172f..11a41978527 100644
--- a/test/jdk/jdk/classfile/AnnotationModelTest.java
+++ b/test/jdk/jdk/classfile/AnnotationModelTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java b/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java
index d4a9e3a4297..464400c5e8a 100644
--- a/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java
+++ b/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java
@@ -23,7 +23,6 @@
/*
* @test
- * @enablePreview
* @modules java.base/jdk.internal.classfile.impl
* java.base/java.util:open
* @comment Opens java.util so HashMap bytecode generation can access its nested
diff --git a/test/jdk/jdk/classfile/ClassPrinterTest.java b/test/jdk/jdk/classfile/ClassPrinterTest.java
index 5dc136f59c3..506f3382b83 100644
--- a/test/jdk/jdk/classfile/ClassPrinterTest.java
+++ b/test/jdk/jdk/classfile/ClassPrinterTest.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8335927
+ * @bug 8335927 8345773
* @summary Testing ClassFile ClassPrinter.
* @run junit ClassPrinterTest
*/
@@ -122,8 +122,7 @@ ClassModel getClassModel() {
@Test
void testPrintYamlTraceAll() throws IOException {
- var out = new StringBuilder();
- ClassPrinter.toYaml(getClassModel(), ClassPrinter.Verbosity.TRACE_ALL, out::append);
+ var out = getClassModel().toDebugString();
assertOut(out,
"""
- class name: Foo
@@ -904,7 +903,7 @@ void testWalkMembersOnly() throws IOException {
assertEquals(node.walk().count(), 42);
}
- private static void assertOut(StringBuilder out, String expected) {
+ private static void assertOut(CharSequence out, String expected) {
// System.out.println("-----------------");
// System.out.println(out.toString());
// System.out.println("-----------------");
diff --git a/test/jdk/jdk/classfile/CorpusTest.java b/test/jdk/jdk/classfile/CorpusTest.java
index 513005370e7..0d8c35e47df 100644
--- a/test/jdk/jdk/classfile/CorpusTest.java
+++ b/test/jdk/jdk/classfile/CorpusTest.java
@@ -25,6 +25,7 @@
* @test
* @bug 8325485
* @summary Testing ClassFile on small Corpus.
+ * @enablePreview
* @build helpers.* testdata.*
* @run junit/othervm/timeout=480 -Djunit.jupiter.execution.parallel.enabled=true CorpusTest
*/
diff --git a/test/jdk/jdk/classfile/FilterDeadLabelsTest.java b/test/jdk/jdk/classfile/FilterDeadLabelsTest.java
index 810f02d5f19..53c0f4f7a65 100644
--- a/test/jdk/jdk/classfile/FilterDeadLabelsTest.java
+++ b/test/jdk/jdk/classfile/FilterDeadLabelsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/classfile/LowJCovAttributeTest.java b/test/jdk/jdk/classfile/LowJCovAttributeTest.java
index ed29a057357..6fda1983d07 100644
--- a/test/jdk/jdk/classfile/LowJCovAttributeTest.java
+++ b/test/jdk/jdk/classfile/LowJCovAttributeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/classfile/LowModuleTest.java b/test/jdk/jdk/classfile/LowModuleTest.java
index b017fe84756..17037fee3be 100644
--- a/test/jdk/jdk/classfile/LowModuleTest.java
+++ b/test/jdk/jdk/classfile/LowModuleTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/classfile/LvtTest.java b/test/jdk/jdk/classfile/LvtTest.java
index d95a4fb7b29..5d3075a311f 100644
--- a/test/jdk/jdk/classfile/LvtTest.java
+++ b/test/jdk/jdk/classfile/LvtTest.java
@@ -24,6 +24,7 @@
/*
* @test
* @summary Testing ClassFile local variable table.
+ * @enablePreview
* @compile -g testdata/Lvt.java
* @run junit LvtTest
*/
diff --git a/test/jdk/jdk/classfile/ModuleBuilderTest.java b/test/jdk/jdk/classfile/ModuleBuilderTest.java
index 38e2dfef35a..aaf4b3098be 100644
--- a/test/jdk/jdk/classfile/ModuleBuilderTest.java
+++ b/test/jdk/jdk/classfile/ModuleBuilderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/classfile/SnippetsTest.java b/test/jdk/jdk/classfile/SnippetsTest.java
index 51a73b93d67..f6fa2281e14 100644
--- a/test/jdk/jdk/classfile/SnippetsTest.java
+++ b/test/jdk/jdk/classfile/SnippetsTest.java
@@ -53,8 +53,7 @@ void testSnippet(String source) throws Exception {
var compilationUnits = fileManager.getJavaFileObjectsFromFiles(List.of(src));
fileManager.setLocation(StandardLocation.CLASS_OUTPUT,
List.of(Paths.get(System.getProperty("test.classes", ".")).toFile()));
- List<String> flags = List.of(
- "--source", String.valueOf(Runtime.version().feature()));
+ List<String> flags = List.of();
if (source.contains("jdk/internal/classfile/components")) {
flags = new ArrayList<>(flags);
flags.add("--add-exports");
diff --git a/test/jdk/jdk/classfile/TEST.properties b/test/jdk/jdk/classfile/TEST.properties
index 296312b258f..62414b36eae 100644
--- a/test/jdk/jdk/classfile/TEST.properties
+++ b/test/jdk/jdk/classfile/TEST.properties
@@ -1,5 +1,4 @@
maxOutputSize = 2500000
-enablePreview = true
modules = \
java.base/jdk.internal.classfile.components \
java.base/jdk.internal.classfile.impl \
diff --git a/test/jdk/jdk/classfile/TransformTests.java b/test/jdk/jdk/classfile/TransformTests.java
index b78da8b4311..c2a961933d7 100644
--- a/test/jdk/jdk/classfile/TransformTests.java
+++ b/test/jdk/jdk/classfile/TransformTests.java
@@ -25,6 +25,7 @@
* @test
* @bug 8335935 8336588
* @summary Testing ClassFile transformations.
+ * @enablePreview
* @run junit TransformTests
*/
diff --git a/test/jdk/jdk/classfile/VerifierSelfTest.java b/test/jdk/jdk/classfile/VerifierSelfTest.java
index bc4ad5ab4ef..80ee89d5fda 100644
--- a/test/jdk/jdk/classfile/VerifierSelfTest.java
+++ b/test/jdk/jdk/classfile/VerifierSelfTest.java
@@ -25,7 +25,6 @@
* @test
* @summary Testing ClassFile Verifier.
* @bug 8333812
- * @enablePreview
* @run junit VerifierSelfTest
*/
import java.io.IOException;
diff --git a/test/jdk/jdk/classfile/examples/ModuleExamples.java b/test/jdk/jdk/classfile/examples/ModuleExamples.java
index d4f4ff9a695..54fc1acdd9c 100644
--- a/test/jdk/jdk/classfile/examples/ModuleExamples.java
+++ b/test/jdk/jdk/classfile/examples/ModuleExamples.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/dynalink/TypeConverterFactoryMemoryLeakTest.java b/test/jdk/jdk/dynalink/TypeConverterFactoryMemoryLeakTest.java
index 4735bb4a08f..8cc8b71e3fd 100644
--- a/test/jdk/jdk/dynalink/TypeConverterFactoryMemoryLeakTest.java
+++ b/test/jdk/jdk/dynalink/TypeConverterFactoryMemoryLeakTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/dynalink/TypeConverterFactoryRetentionTests.java b/test/jdk/jdk/dynalink/TypeConverterFactoryRetentionTests.java
index 8ad972d4502..8ef0311e4de 100644
--- a/test/jdk/jdk/dynalink/TypeConverterFactoryRetentionTests.java
+++ b/test/jdk/jdk/dynalink/TypeConverterFactoryRetentionTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/incubator/vector/VectorMaxConversionTests.java b/test/jdk/jdk/incubator/vector/VectorMaxConversionTests.java
index a8f89f9d705..3f5d2682046 100644
--- a/test/jdk/jdk/incubator/vector/VectorMaxConversionTests.java
+++ b/test/jdk/jdk/incubator/vector/VectorMaxConversionTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java b/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
index 1ca4c091d27..513c315682a 100644
--- a/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
+++ b/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/internal/jline/KeyConversionTest.java b/test/jdk/jdk/internal/jline/KeyConversionTest.java
index ffd116dbbc2..10e25f98df1 100644
--- a/test/jdk/jdk/internal/jline/KeyConversionTest.java
+++ b/test/jdk/jdk/internal/jline/KeyConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/internal/ref/Cleaner/ExitOnThrow.java b/test/jdk/jdk/internal/ref/Cleaner/ExitOnThrow.java
index 7651c92bf77..7e0ab4685d1 100644
--- a/test/jdk/jdk/internal/ref/Cleaner/ExitOnThrow.java
+++ b/test/jdk/jdk/internal/ref/Cleaner/ExitOnThrow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
index 2d5175dcf3f..65e65bf0858 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
@@ -51,7 +51,6 @@
* @bug 8010117
* @summary Verify if CallerSensitive methods are annotated with
* CallerSensitive annotation
- * @enablePreview
* @build CallerSensitiveFinder
* @run main/othervm/timeout=900 CallerSensitiveFinder
*/
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
index 83841fe104b..e1790e6e174 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
@@ -58,7 +58,6 @@
* @test
* @summary CallerSensitive methods should be static or final instance
* methods except the known list of non-final instance methods
- * @enablePreview
* @build CheckCSMs
* @run main/othervm/timeout=900 CheckCSMs
*/
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java b/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
index 781c75b23ae..e8994c3c760 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
@@ -27,7 +27,6 @@
* @bug 8010117
* @summary Test CallerSensitiveFinder to find missing annotation
* @modules java.base/jdk.internal.reflect
- * @enablePreview
* @compile -XDignore.symbol.file MissingCallerSensitive.java
* @build CallerSensitiveFinder
* @run main MissingCallerSensitive
diff --git a/test/jdk/jdk/internal/vm/Continuation/Scoped.java b/test/jdk/jdk/internal/vm/Continuation/Scoped.java
index 1bad8e4aebd..908267792b8 100644
--- a/test/jdk/jdk/internal/vm/Continuation/Scoped.java
+++ b/test/jdk/jdk/internal/vm/Continuation/Scoped.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/internal/vm/TestTranslatedException.java b/test/jdk/jdk/internal/vm/TestTranslatedException.java
index a7d23510a36..0a5bfb18c23 100644
--- a/test/jdk/jdk/internal/vm/TestTranslatedException.java
+++ b/test/jdk/jdk/internal/vm/TestTranslatedException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/api/consumer/streaming/TestJVMExit.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestJVMExit.java
index 77eba735d7a..27dfb0224c1 100644
--- a/test/jdk/jdk/jfr/api/consumer/streaming/TestJVMExit.java
+++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestJVMExit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
index b13fa714109..2d0ce579dd8 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
@@ -61,7 +61,6 @@
* @requires vm.opt.Inline == true | vm.opt.Inline == null
* @library /test/lib
* @modules jdk.jfr
- * @enablePreview
*
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
diff --git a/test/jdk/jdk/jfr/event/compiler/TestCompilerPhase.java b/test/jdk/jdk/jfr/event/compiler/TestCompilerPhase.java
index 6ad73e9a198..02e235a23ca 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerPhase.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerPhase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
index b089013d132..86da3907e9d 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/collection/TestGarbageCollectionEventWithZMajor.java b/test/jdk/jdk/jfr/event/gc/collection/TestGarbageCollectionEventWithZMajor.java
index 3766d9d0d32..5305cfd8d67 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGarbageCollectionEventWithZMajor.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGarbageCollectionEventWithZMajor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/collection/TestGarbageCollectionEventWithZMinor.java b/test/jdk/jdk/jfr/event/gc/collection/TestGarbageCollectionEventWithZMinor.java
index c8d681594dd..65c177d3a68 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGarbageCollectionEventWithZMinor.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGarbageCollectionEventWithZMinor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/collection/TestZOldGarbageCollectionEvent.java b/test/jdk/jdk/jfr/event/gc/collection/TestZOldGarbageCollectionEvent.java
index 50177ffd16b..38e5ca49e60 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestZOldGarbageCollectionEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestZOldGarbageCollectionEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/collection/TestZYoungGarbageCollectionEvent.java b/test/jdk/jdk/jfr/event/gc/collection/TestZYoungGarbageCollectionEvent.java
index f8e4e8b344b..40c0a2adec3 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestZYoungGarbageCollectionEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestZYoungGarbageCollectionEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/detailed/TestGCPhaseConcurrent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestGCPhaseConcurrent.java
index 48e188346f8..66e3e026536 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestGCPhaseConcurrent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestGCPhaseConcurrent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java
index 1b4ce259784..b17c678ec55 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/detailed/TestZPageAllocationEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestZPageAllocationEvent.java
index d672a2654b8..c17e19193db 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestZPageAllocationEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestZPageAllocationEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetEvent.java
index f14eec97548..baae61d5cd8 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetGroupEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetGroupEvent.java
index f00655cf942..0e93aed8b8e 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetGroupEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetGroupEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/detailed/TestZUncommitEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestZUncommitEvent.java
index e7a37e2de55..1aa2ba6af0b 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestZUncommitEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestZUncommitEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/detailed/TestZUnmapEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestZUnmapEvent.java
index a19e89771c0..fabbdce9c94 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestZUnmapEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestZUnmapEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
index fa91d77e2fb..4f83b37765d 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
index ad633ea26de..0cc00bb1e4b 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
index 1cf75ff8fac..e74528c20e1 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
index 7259ff5f445..0454d8fe77f 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
index c06862ad2e6..07a1c63fda1 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
index c74eeefa793..5a0cc9288b6 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
index cc669024015..8e71c8d55a8 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
index 7f0ce364b6a..4d9a53e9afd 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
index ebd1efccfee..733b4935481 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
index 6dbbc16e283..341a3e53aa8 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/io/TestInstrumentation.java b/test/jdk/jdk/jfr/event/io/TestInstrumentation.java
index daa3d0162d4..beef8437a34 100644
--- a/test/jdk/jdk/jfr/event/io/TestInstrumentation.java
+++ b/test/jdk/jdk/jfr/event/io/TestInstrumentation.java
@@ -58,8 +58,6 @@
* @modules java.instrument
* jdk.jartool/sun.tools.jar
* jdk.jfr
- * @enablePreview
- * @comment update --enable-preview in launchTest() too
*
* @run main/othervm jdk.jfr.event.io.TestInstrumentation
*/
@@ -281,7 +279,6 @@ private static void launchTest() throws Throwable {
String[] args = {
"-Xbootclasspath/a:" + testClassDir + "InstrumentationCallback.jar",
- "--enable-preview",
"-classpath", classpath,
"-javaagent:" + testClassDir + "TestInstrumentation.jar",
"jdk.jfr.event.io.TestInstrumentation$TestMain" };
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestZ.java b/test/jdk/jdk/jfr/event/oldobject/TestZ.java
index 99605846382..8aff89ce7de 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestZ.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestZ.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/runtime/TestSizeTFlags.java b/test/jdk/jdk/jfr/event/runtime/TestSizeTFlags.java
index ae21537840f..3eaf4cccf6c 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestSizeTFlags.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestSizeTFlags.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java b/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java
index 3b4551d5eec..31fb306c04d 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java b/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java
index 049a1172d0c..d5997f1ad46 100644
--- a/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java
+++ b/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java
@@ -52,7 +52,6 @@
* @requires vm.hasJFR
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
- * @enablePreview
* @build jdk.jfr.javaagent.InstrumentationEventCallback
* jdk.jfr.javaagent.TestEventInstrumentation
* @run driver jdk.test.lib.util.JavaAgentBuilder
diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdPreserveRepository.java b/test/jdk/jdk/jfr/jcmd/TestJcmdPreserveRepository.java
index 2ab6bad6259..374c760ae9b 100644
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdPreserveRepository.java
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdPreserveRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/jdk/jfr/startupargs/TestStartDuration.java b/test/jdk/jdk/jfr/startupargs/TestStartDuration.java
index df27c054dd8..d9697492d94 100644
--- a/test/jdk/jdk/jfr/startupargs/TestStartDuration.java
+++ b/test/jdk/jdk/jfr/startupargs/TestStartDuration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 +38,7 @@
* @summary Start a recording with duration. Verify recording stops.
* @key jfr
* @requires vm.hasJFR
+ * @requires vm.flagless
* @library /test/lib /test/jdk
* @run main jdk.jfr.startupargs.TestStartDuration
*/
diff --git a/test/jdk/jdk/lambda/TEST.properties b/test/jdk/jdk/lambda/TEST.properties
index d6687af079f..eaae109a7fc 100644
--- a/test/jdk/jdk/lambda/TEST.properties
+++ b/test/jdk/jdk/lambda/TEST.properties
@@ -4,4 +4,3 @@ TestNG.dirs = .
maxOutputSize = 250000
modules = jdk.compiler jdk.zipfs
-enablePreview = true
\ No newline at end of file
diff --git a/test/jdk/jdk/modules/incubator/ServiceBinding.java b/test/jdk/jdk/modules/incubator/ServiceBinding.java
index 9af48b76b21..b68164cc8cf 100644
--- a/test/jdk/jdk/modules/incubator/ServiceBinding.java
+++ b/test/jdk/jdk/modules/incubator/ServiceBinding.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
/**
* @test
* @bug 8233922
- * @enablePreview
* @modules java.base/jdk.internal.module
* @library /test/lib
* @build ServiceBinding TestBootLayer
diff --git a/test/jdk/jni/nullCaller/NullCallerTest.java b/test/jdk/jni/nullCaller/NullCallerTest.java
index 106a90e89c8..2e54760ace0 100644
--- a/test/jdk/jni/nullCaller/NullCallerTest.java
+++ b/test/jdk/jni/nullCaller/NullCallerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/lib/client/ExtendedRobot.java b/test/jdk/lib/client/ExtendedRobot.java
index 1bcf8e18dfa..9f4a451236b 100644
--- a/test/jdk/lib/client/ExtendedRobot.java
+++ b/test/jdk/lib/client/ExtendedRobot.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/performance/client/SwingMark/src/resources/TextAreaTest.properties b/test/jdk/performance/client/SwingMark/src/resources/TextAreaTest.properties
index a3a8e39ce59..f71124c9335 100644
--- a/test/jdk/performance/client/SwingMark/src/resources/TextAreaTest.properties
+++ b/test/jdk/performance/client/SwingMark/src/resources/TextAreaTest.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
diff --git a/test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtAlphaDifferentSrcDst.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtAlphaDifferentSrcDst.java
index 22868ffaf3c..51adff62d06 100644
--- a/test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtAlphaDifferentSrcDst.java
+++ b/test/jdk/sun/java2d/cmm/ColorConvertOp/ColCvtAlphaDifferentSrcDst.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/security/ec/InvalidCurve.java b/test/jdk/sun/security/ec/InvalidCurve.java
index 76d3b6b79e6..19a86705c42 100644
--- a/test/jdk/sun/security/ec/InvalidCurve.java
+++ b/test/jdk/sun/security/ec/InvalidCurve.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java b/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java
index 11a6a781e01..eacc0337cb6 100644
--- a/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java
+++ b/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java b/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java
index 476dc954884..f7a7fabca31 100644
--- a/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java
+++ b/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/security/ssl/SSLCipher/SSLSocketNoServerHelloClientShutdown.java b/test/jdk/sun/security/ssl/SSLCipher/SSLSocketNoServerHelloClientShutdown.java
index 56789e41a9e..745de16637c 100644
--- a/test/jdk/sun/security/ssl/SSLCipher/SSLSocketNoServerHelloClientShutdown.java
+++ b/test/jdk/sun/security/ssl/SSLCipher/SSLSocketNoServerHelloClientShutdown.java
@@ -36,10 +36,11 @@
import static jdk.test.lib.security.SecurityUtils.inspectTlsBuffer;
import java.io.InputStream;
+import java.lang.Override;
import java.net.InetSocketAddress;
import java.nio.channels.SocketChannel;
import java.security.GeneralSecurityException;
-
+import java.util.concurrent.CountDownLatch;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLEngineResult.Status;
@@ -52,12 +53,15 @@
* To reproduce @bug 8331682 (client sends an unencrypted TLS alert during
* TLSv1.3 handshake) with SSLSockets we use an SSLSocket on the server side
* and a plain TCP socket backed by SSLEngine on the client side.
+ * Using SSLEngine allows the client to force the generation of the plaintext
+ * alert messages.
*/
public class SSLSocketNoServerHelloClientShutdown
extends SSLEngineNoServerHelloClientShutdown {
private volatile Exception clientException;
private volatile Exception serverException;
+ private final CountDownLatch serverLatch;
public static void main(String[] args) throws Exception {
new SSLSocketNoServerHelloClientShutdown().runTest();
@@ -65,6 +69,7 @@ public static void main(String[] args) throws Exception {
public SSLSocketNoServerHelloClientShutdown() throws Exception {
super();
+ serverLatch = new CountDownLatch(1);
}
private void runTest() throws Exception {
@@ -84,7 +89,6 @@ private void runTest() throws Exception {
try {
// Server-side SSL socket that will read.
SSLSocket socket = (SSLSocket) serverSocket.accept();
- socket.setSoTimeout(2000);
InputStream is = socket.getInputStream();
byte[] inbound = new byte[512];
@@ -96,10 +100,12 @@ private void runTest() throws Exception {
serverException = e;
log(e.toString());
} finally {
+ serverLatch.countDown();
thread.join();
}
} finally {
if (serverException != null) {
+ serverException.printStackTrace();
assertEquals(
SSLProtocolException.class, serverException.getClass());
assertEquals(GeneralSecurityException.class,
@@ -125,7 +131,6 @@ public void run() {
new InetSocketAddress("localhost", port))) {
SSLEngineResult clientResult;
- clientSocketChannel.socket().setSoTimeout(500);
log("=================");
@@ -162,9 +167,7 @@ public void run() {
log("---Client sends unencrypted alerts---");
int len = clientSocketChannel.write(cTOs);
- // Give server a chance to read before we shutdown via
- // the try-with-resources block.
- Thread.sleep(2000);
+ serverLatch.await();
} catch (Exception e) {
clientException = e;
}
diff --git a/test/jdk/sun/security/ssl/SSLLogger/LoggingFormatConsistency.java b/test/jdk/sun/security/ssl/SSLLogger/LoggingFormatConsistency.java
index 5cfa9c9a680..e0c7e76a0a7 100644
--- a/test/jdk/sun/security/ssl/SSLLogger/LoggingFormatConsistency.java
+++ b/test/jdk/sun/security/ssl/SSLLogger/LoggingFormatConsistency.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/security/ssl/SSLSocketImpl/IgnorableExceptionMessages.java b/test/jdk/sun/security/ssl/SSLSocketImpl/IgnorableExceptionMessages.java
index a1c9cad2271..c2fd4cf82c0 100644
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/IgnorableExceptionMessages.java
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/IgnorableExceptionMessages.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java b/test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java
index 06b5ed082f5..3655c01b5b0 100644
--- a/test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java
+++ b/test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 +103,7 @@ void start() throws Throwable {
"-alias", CA_KEY_ALIAS,
"-keystore", KEYSTORE,
"-storepass", PASSWORD,
+ "-startdate", "-1M",
"-keypass", PASSWORD,
"-validity", Integer.toString(VALIDITY),
"-infile", "certreq",
diff --git a/test/jdk/sun/security/tools/keytool/fakegen/java.base/sun/security/ec/ECKeyPairGenerator.java b/test/jdk/sun/security/tools/keytool/fakegen/java.base/sun/security/ec/ECKeyPairGenerator.java
index 5e7429ee616..3c55c9501a7 100644
--- a/test/jdk/sun/security/tools/keytool/fakegen/java.base/sun/security/ec/ECKeyPairGenerator.java
+++ b/test/jdk/sun/security/tools/keytool/fakegen/java.base/sun/security/ec/ECKeyPairGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
index 904f672ba40..a24b0968f70 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
+++ b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/tools/jcmd/TestProcessHelper.java b/test/jdk/sun/tools/jcmd/TestProcessHelper.java
index b8a3dba303a..833309d012a 100644
--- a/test/jdk/sun/tools/jcmd/TestProcessHelper.java
+++ b/test/jdk/sun/tools/jcmd/TestProcessHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
*
* @requires vm.flagless
* @requires os.family == "linux"
- * @enablePreview
* @modules jdk.jcmd/sun.tools.common:+open
* java.base/jdk.internal.module
* @library /test/lib
diff --git a/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java b/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java
index 89a5801cff7..659eac2ee8f 100644
--- a/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java
+++ b/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/tools/jmap/BasicJMapTest.java b/test/jdk/sun/tools/jmap/BasicJMapTest.java
index 991648b96c2..c3eeb717e9f 100644
--- a/test/jdk/sun/tools/jmap/BasicJMapTest.java
+++ b/test/jdk/sun/tools/jmap/BasicJMapTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/sun/tools/jstatd/JstatdTest.java b/test/jdk/sun/tools/jstatd/JstatdTest.java
index 5041bc40d75..87518567df7 100644
--- a/test/jdk/sun/tools/jstatd/JstatdTest.java
+++ b/test/jdk/sun/tools/jstatd/JstatdTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/tools/jar/InputFilesTest.java b/test/jdk/tools/jar/InputFilesTest.java
index 6a0a7e29021..2921ff256ea 100644
--- a/test/jdk/tools/jar/InputFilesTest.java
+++ b/test/jdk/tools/jar/InputFilesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/tools/jimage/JImageNonAsciiNameTest.java b/test/jdk/tools/jimage/JImageNonAsciiNameTest.java
index c50a10539fc..c891728bd4d 100644
--- a/test/jdk/tools/jimage/JImageNonAsciiNameTest.java
+++ b/test/jdk/tools/jimage/JImageNonAsciiNameTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,7 +37,6 @@
* @summary Test non-ASCII path in custom JRE
* @library ../lib
* /test/lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jimage
* @build tests.*
diff --git a/test/jdk/tools/jimage/JImageTest.java b/test/jdk/tools/jimage/JImageTest.java
index 3342c566025..e68c53b2316 100644
--- a/test/jdk/tools/jimage/JImageTest.java
+++ b/test/jdk/tools/jimage/JImageTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
* @summary Test jimage tool
* @bug 8222100
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jmod
* jdk.jlink/jdk.tools.jimage
diff --git a/test/jdk/tools/jlink/DefaultProviderTest.java b/test/jdk/tools/jlink/DefaultProviderTest.java
index 3177b37666a..7a43c1121bd 100644
--- a/test/jdk/tools/jlink/DefaultProviderTest.java
+++ b/test/jdk/tools/jlink/DefaultProviderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
* @author Jean-Francois Denise
* @requires vm.compMode != "Xcomp"
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.plugin
diff --git a/test/jdk/tools/jlink/ExplodedModuleNameTest.java b/test/jdk/tools/jlink/ExplodedModuleNameTest.java
index 69a564c7538..2defcf57401 100644
--- a/test/jdk/tools/jlink/ExplodedModuleNameTest.java
+++ b/test/jdk/tools/jlink/ExplodedModuleNameTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8192986
* @summary Inconsistent handling of exploded modules in jlink
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jmod
diff --git a/test/jdk/tools/jlink/ImageFileCreatorTest.java b/test/jdk/tools/jlink/ImageFileCreatorTest.java
index 52a878e566a..73cdf56a4f0 100644
--- a/test/jdk/tools/jlink/ImageFileCreatorTest.java
+++ b/test/jdk/tools/jlink/ImageFileCreatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/tools/jlink/IntegrationTest.java b/test/jdk/tools/jlink/IntegrationTest.java
index 686dd194ada..d79752f6d56 100644
--- a/test/jdk/tools/jlink/IntegrationTest.java
+++ b/test/jdk/tools/jlink/IntegrationTest.java
@@ -57,7 +57,6 @@
* @summary Test integration API
* @author Jean-Francois Denise
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.builder
* jdk.jlink/jdk.tools.jlink.internal
diff --git a/test/jdk/tools/jlink/JLink100Modules.java b/test/jdk/tools/jlink/JLink100Modules.java
index bb4f18cb4e8..1ce63aec9e6 100644
--- a/test/jdk/tools/jlink/JLink100Modules.java
+++ b/test/jdk/tools/jlink/JLink100Modules.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary Make sure that 100 modules can be linked using jlink.
* @bug 8240567
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.plugin
diff --git a/test/jdk/tools/jlink/JLink2Test.java b/test/jdk/tools/jlink/JLink2Test.java
index 1e0fe693489..96aae03e46f 100644
--- a/test/jdk/tools/jlink/JLink2Test.java
+++ b/test/jdk/tools/jlink/JLink2Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary Test image creation
* @author Jean-Francois Denise
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.plugin
diff --git a/test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java b/test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java
index c7af8865a79..fbdbc6e3ba4 100644
--- a/test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java
+++ b/test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java
@@ -38,7 +38,6 @@
* @bug 8311591
* @library /test/lib
* ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.plugin
diff --git a/test/jdk/tools/jlink/JLinkNegativeTest.java b/test/jdk/tools/jlink/JLinkNegativeTest.java
index 01b28ead637..72836e4ec60 100644
--- a/test/jdk/tools/jlink/JLinkNegativeTest.java
+++ b/test/jdk/tools/jlink/JLinkNegativeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @bug 8174718
* @bug 8189671
* @author Andrei Eremeev
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* java.base/jdk.internal.module
* jdk.jlink/jdk.tools.jlink.internal
diff --git a/test/jdk/tools/jlink/JLinkOptionsTest.java b/test/jdk/tools/jlink/JLinkOptionsTest.java
index 95b4268069d..230d1078471 100644
--- a/test/jdk/tools/jlink/JLinkOptionsTest.java
+++ b/test/jdk/tools/jlink/JLinkOptionsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary Test jlink options
* @author Jean-Francois Denise
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.plugin
diff --git a/test/jdk/tools/jlink/JLinkPluginsTest.java b/test/jdk/tools/jlink/JLinkPluginsTest.java
index cd524db747a..3f525a863ad 100644
--- a/test/jdk/tools/jlink/JLinkPluginsTest.java
+++ b/test/jdk/tools/jlink/JLinkPluginsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @author Jean-Francois Denise
* @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jmod
diff --git a/test/jdk/tools/jlink/JLinkTest.java b/test/jdk/tools/jlink/JLinkTest.java
index e897badad13..c0fabe06a8c 100644
--- a/test/jdk/tools/jlink/JLinkTest.java
+++ b/test/jdk/tools/jlink/JLinkTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,6 @@
* @author Jean-Francois Denise
* @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.plugin
diff --git a/test/jdk/tools/jlink/ModuleNamesOrderTest.java b/test/jdk/tools/jlink/ModuleNamesOrderTest.java
index d8fda1387d7..3668675a1a1 100644
--- a/test/jdk/tools/jlink/ModuleNamesOrderTest.java
+++ b/test/jdk/tools/jlink/ModuleNamesOrderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
* @bug 8168925
* @summary MODULES property should be topologically ordered and space-separated list
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jmod
diff --git a/test/jdk/tools/jlink/NativeTest.java b/test/jdk/tools/jlink/NativeTest.java
index 8fba7b8f699..8f63f628f1c 100644
--- a/test/jdk/tools/jlink/NativeTest.java
+++ b/test/jdk/tools/jlink/NativeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary Test config, cmd and lib directories of jmod.
* @author Andrei Eremeev
* @library ../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jmod
diff --git a/test/jdk/tools/jlink/plugins/AddOptionsPluginTest.java b/test/jdk/tools/jlink/plugins/AddOptionsPluginTest.java
index acb2e65fd38..3b1dc608710 100644
--- a/test/jdk/tools/jlink/plugins/AddOptionsPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/AddOptionsPluginTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary Test the --add-options plugin
* @library ../../lib
* @library /test/lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jmod
diff --git a/test/jdk/tools/jlink/plugins/CDSPluginTest.java b/test/jdk/tools/jlink/plugins/CDSPluginTest.java
index c9766183297..4193c0a0244 100644
--- a/test/jdk/tools/jlink/plugins/CDSPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/CDSPluginTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @requires vm.cds
* @library ../../lib
* @library /test/lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jmod
diff --git a/test/jdk/tools/jlink/plugins/CompressorPluginTest.java b/test/jdk/tools/jlink/plugins/CompressorPluginTest.java
index c0816d98273..2fee7e92110 100644
--- a/test/jdk/tools/jlink/plugins/CompressorPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/CompressorPluginTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
index 1acad93f5d3..998444b9a77 100644
--- a/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
@@ -50,7 +50,6 @@
* @bug 8252919 8327499
* @library ../../lib
* @summary Test --generate-jli-classes plugin
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.internal.plugins
diff --git a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
index e2dd3403c83..f0fe3149247 100644
--- a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
@@ -47,7 +47,6 @@
* @author Naoto Sato
* @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
* @library ../../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.internal.plugins
diff --git a/test/jdk/tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java b/test/jdk/tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java
index 207290d6cf7..3c97674871e 100644
--- a/test/jdk/tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @requires vm.jvmci
* @library ../../lib
* @library /test/lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jmod
diff --git a/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java b/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java
index 3979c7e833b..0724cd37c94 100644
--- a/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary Test StringSharingPluginTest
* @author Jean-Francois Denise
* @library ../../lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* java.base/jdk.internal.jimage.decompressor
* jdk.jlink/jdk.tools.jlink.internal
diff --git a/test/jdk/tools/jlink/plugins/StripJavaDebugAttributesPluginTest.java b/test/jdk/tools/jlink/plugins/StripJavaDebugAttributesPluginTest.java
index 0bcb19e087c..8886b32f614 100644
--- a/test/jdk/tools/jlink/plugins/StripJavaDebugAttributesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/StripJavaDebugAttributesPluginTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @author Jean-Francois Denise
* @library ../../lib
* @build tests.*
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.internal.plugins
diff --git a/test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java b/test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java
index 2f2c52a6c17..79f8317eef5 100644
--- a/test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java
+++ b/test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@
* @summary Test the --vendor-version --vendor-url-bug plugins
* @library ../../lib
* @library /test/lib
- * @enablePreview
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jmod
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CommandArguments.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CommandArguments.java
index e5941918938..369ee337dc8 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CommandArguments.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CommandArguments.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java
index 54faadcee1e..422b0fcddc8 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 4732864 6280605 7064544 8014636 8016328 8025633 8071982 8182765
- * 8274781
+ * 8274781 8345664
* @summary Make sure that you can link from one member to another using
* non-qualified name, furthermore, ensure the right one is linked.
* @library ../../lib
@@ -50,6 +50,17 @@ public void test() {
"pkg", testSrc("checkPkg/B.java"));
checkExit(Exit.OK);
+ checkOutput("pkg/package-summary.html", true,
+ """
+ Qualified Link: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
+ Unqualified Link1: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
+ Unqualified Link2: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
+ Qualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(pkg.\
+ C.InnerC, pkg.C.InnerC2)</code></a>.<br/>
+ Unqualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(C.InnerC, C.InnerC2)</code></a>.<br/>
+ Unqualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(InnerC, InnerC2)</code></a>.<br/>
+ Link w/o Signature: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(C.InnerC, C.InnerC2)</code></a>.<br/>
+ Package Link: <a href="package-summary.html"><code>pkg</code></a>.<br/>""");
checkOutput("pkg/C.html", true,
"""
Qualified Link: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
@@ -59,6 +70,7 @@ public void test() {
C.InnerC, pkg.C.InnerC2)</code></a>.<br/>
Unqualified Link: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>
Unqualified Link: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(InnerC, InnerC2)</code></a>.<br/>
+ Link w/o Signature: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>
Package Link: <a href="package-summary.html"><code>pkg</code></a>.<br/>""");
checkOutput("pkg/C.InnerC.html", true,
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
index 3adfe661965..86d678fbaa5 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 @@ public void testLinkModuleInternal(Path base) throws Exception {
<a href="../../../../m1/module-summary.html"><code>m1</code></a>
<a href="../../../../m1/com/m1/lib/package-summary.html"><code>package link</code></a>
<a href="../../../../m1/com/m1/lib/Lib.html" title="class in com.m1.lib"><code>Lib</code></a>
- <a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(java.lang.String)</code></a>
+ <a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a>
<a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a>
<a href="../../../../m2/module-summary.html">m2</a>
<a href="../../../../m2/module-summary.html">m2</a>
@@ -110,7 +110,7 @@ public void testLinkModuleExternal(Path base) throws Exception {
<a href="../../../../../out1/m1/com/m1/lib/Lib.html" title="class or interface in com.m1.lib"\
class="external-link"><code>Lib</code></a>
<a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or\
- interface in com.m1.lib" class="external-link"><code>Lib.method(java.lang.String)</code></a>
+ interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a>
<a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or\
interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a>
<a href="../../../../../out1/m2/module-summary.html" class="external-link">m2</a>
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java
index 97b3f402235..16e788595ff 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,6 +30,7 @@
* Qualified Link: {@link #method(pkg.C.InnerC, pkg.C.InnerC2)}.<br/>
* Unqualified Link: {@link #method(C.InnerC, C.InnerC2)}.<br/>
* Unqualified Link: {@link #method(InnerC, InnerC2)}.<br/>
+ * Link w/o Signature: {@link #method}.<br/>
* Package Link: {@link pkg}.<br/>
*
*
diff --git a/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java b/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java
index b34574a592d..ce5ec77a573 100644
--- a/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java
+++ b/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* 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 6758050 8025633 8182765
+ * @bug 6758050 8025633 8182765 8345664
* @summary Test HTML output for nested generic types.
* @library ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -49,7 +49,6 @@ public void test() {
checkOutput("pkg/NestedGenerics.html", true,
"""
- <div class="block">Contains <a href="#foo(java.util.Map)"><code>foo(java.util.Ma\
- p<A, java.util.Map<A, A>>)</code></a></div>""");
+ <div class="block">Contains <a href="#foo(java.util.Map)"><code>foo(Map)</code></a></div>""");
}
}
diff --git a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
index 6864aca1959..810db378394 100644
--- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
+++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,13 +79,13 @@ public void testSeeModuleInternal(Path base) throws Exception {
<li><a href="../../../../m1/module-summary.html"><code>m1</code></a></li>
<li><a href="../../../../m1/com/m1/lib/package-summary.html"><code>com.m1.lib</code></a></li>
<li><a href="../../../../m1/com/m1/lib/Lib.html" title="class in com.m1.lib"><code>Lib</code></a></li>
- <li><a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(java.lang.String)</code></a></li>
+ <li><a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a></li>
<li><a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a></li>
<li><a href="../../../../m2/module-summary.html"><code>m2</code></a></li>
<li><a href="../../../../m2/module-summary.html"><code>m2</code></a></li>
<li><a href="../../../../m2/com/m2/lib/package-summary.html"><code>com.m2.lib</code></a></li>
<li><a href="../../../../m2/com/m2/lib/Lib.html" title="class in com.m2.lib"><code>Lib</code></a></li>
- <li><a href="../../../../m2/com/m2/lib/Lib.html#method(java.lang.String)"><code>Lib.method(java.lang.String)</code></a></li>
+ <li><a href="../../../../m2/com/m2/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a></li>
<li><a href="../../../../m2/com/m2/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a></li>
""");
}
@@ -115,7 +115,7 @@ public void testSeeModuleExternal(Path base) throws Exception {
<li><a href="../../../../../out1/m1/com/m1/lib/package-summary.html" class="external-link"><code>m1/com.m1.lib</code></a></li>
<li><a href="../../../../../out1/m1/com/m1/lib/Lib.html" title="class or interface in com.m1.lib" class="external-link"><code>Lib</code></a></li>
<li><a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or \
- interface in com.m1.lib" class="external-link"><code>Lib.method(java.lang.String)</code></a></li>
+ interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a></li>
<li><a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or \
interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a></li>
<li><a href="../../../../../out1/m2/module-summary.html" class="external-link"><code>m2</code></a></li>
@@ -123,7 +123,7 @@ interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></
<li><a href="../../../../../out1/m2/com/m2/lib/package-summary.html" class="external-link"><code>m2/com.m2.lib</code></a></li>
<li><a href="../../../../../out1/m2/com/m2/lib/Lib.html" title="class or interface in com.m2.lib" class="external-link"><code>Lib</code></a></li>
<li><a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or \
- interface in com.m2.lib" class="external-link"><code>Lib.method(java.lang.String)</code></a></li>
+ interface in com.m2.lib" class="external-link"><code>Lib.method(String)</code></a></li>
<li><a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or \
interface in com.m2.lib" class="external-link"><code>Lib.method(String)</code></a></li>
""");
diff --git a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
index f188aa036f4..ee5014a310a 100644
--- a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
+++ b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
@@ -29,7 +29,6 @@
* jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.resources:open
* jdk.javadoc/jdk.javadoc.internal.doclets.toolkit.resources:open
* jdk.javadoc/jdk.javadoc.internal.tool.resources:open
- * @enablePreview
*/
import java.io.*;
diff --git a/test/langtools/tools/javac/4241573/T4241573.java b/test/langtools/tools/javac/4241573/T4241573.java
index 9989ff83454..de832aef706 100644
--- a/test/langtools/tools/javac/4241573/T4241573.java
+++ b/test/langtools/tools/javac/4241573/T4241573.java
@@ -25,8 +25,6 @@
* @test
* @bug 4241573
* @summary SourceFile attribute includes full path
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/7003595/T7003595.java b/test/langtools/tools/javac/7003595/T7003595.java
index c5c12259c14..3aafbf74b6a 100644
--- a/test/langtools/tools/javac/7003595/T7003595.java
+++ b/test/langtools/tools/javac/7003595/T7003595.java
@@ -25,9 +25,7 @@
* @test
* @bug 7003595
* @summary IncompatibleClassChangeError with unreferenced local class with subclass
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
*/
diff --git a/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java b/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java
index cff6e774a2f..1fd3fb3fbcc 100644
--- a/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java
+++ b/test/langtools/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java
@@ -25,8 +25,6 @@
* @test
* @bug 7153958 8073372
* @summary add constant pool reference to class containing inlined constants
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile pkg/ClassToBeStaticallyImportedA.java pkg/ClassToBeStaticallyImportedB.java CPoolRefClassContainingInlinedCts.java
* @run main CPoolRefClassContainingInlinedCts
*/
diff --git a/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java b/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
index 734b1741682..66cd9e91ff2 100644
--- a/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
+++ b/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
@@ -26,7 +26,6 @@
* @bug 7166455
* @summary javac doesn't set ACC_STRICT bit on <clinit> for strictfp class
* @library /tools/lib /test/lib
- * @enablePreview
*/
import jdk.test.lib.compiler.CompilerUtils;
diff --git a/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java b/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java
index eee423e48a8..99ad19203b5 100644
--- a/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java
+++ b/test/langtools/tools/javac/8000518/DuplicateConstantPoolEntry.java
@@ -26,8 +26,6 @@
* @bug 8000518
* @summary Javac generates duplicate name_and_type constant pool entry for
* class BinaryOpValueExp.java
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @run main DuplicateConstantPoolEntry
*/
diff --git a/test/langtools/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java b/test/langtools/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java
index de8cdbc5af3..4ba8c7a6491 100644
--- a/test/langtools/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java
+++ b/test/langtools/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java
@@ -25,8 +25,6 @@
* @test
* @bug 8005931
* @summary javac doesn't set ACC_STRICT for classes with package access
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @run main CheckACC_STRICTFlagOnPkgAccessClassTest
*/
diff --git a/test/langtools/tools/javac/8009170/RedundantByteCodeInArrayTest.java b/test/langtools/tools/javac/8009170/RedundantByteCodeInArrayTest.java
index 8f2ed91039c..8b8eb23be4d 100644
--- a/test/langtools/tools/javac/8009170/RedundantByteCodeInArrayTest.java
+++ b/test/langtools/tools/javac/8009170/RedundantByteCodeInArrayTest.java
@@ -26,7 +26,6 @@
* @bug 8009170
* @summary Regression: javac generates redundant bytecode in assignop involving
* arrays
- * @enablePreview
* @run main RedundantByteCodeInArrayTest
*/
diff --git a/test/langtools/tools/javac/AnonymousClass/AnonymousClassFlags.java b/test/langtools/tools/javac/AnonymousClass/AnonymousClassFlags.java
index 60e7c324acb..d5d1378bb7b 100644
--- a/test/langtools/tools/javac/AnonymousClass/AnonymousClassFlags.java
+++ b/test/langtools/tools/javac/AnonymousClass/AnonymousClassFlags.java
@@ -25,8 +25,6 @@
* @test
* @bug 8161013
* @summary Verify that anonymous class binaries have the correct flags set
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @run main AnonymousClassFlags
*/
diff --git a/test/langtools/tools/javac/MethodParameters/AnnotationTest.java b/test/langtools/tools/javac/MethodParameters/AnnotationTest.java
index e30f83f8af3..c373de15e52 100644
--- a/test/langtools/tools/javac/MethodParameters/AnnotationTest.java
+++ b/test/langtools/tools/javac/MethodParameters/AnnotationTest.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters AnnotationTest.java
* @run main MethodParametersTester AnnotationTest AnnotationTest.out
diff --git a/test/langtools/tools/javac/MethodParameters/AnonymousClass.java b/test/langtools/tools/javac/MethodParameters/AnonymousClass.java
index 3926d9623a3..d0bf322b0c6 100644
--- a/test/langtools/tools/javac/MethodParameters/AnonymousClass.java
+++ b/test/langtools/tools/javac/MethodParameters/AnonymousClass.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters AnonymousClass.java
* @run main MethodParametersTester AnonymousClass AnonymousClass.out
diff --git a/test/langtools/tools/javac/MethodParameters/ClassFileVisitor.java b/test/langtools/tools/javac/MethodParameters/ClassFileVisitor.java
index 3e2d151808f..5a2f3dfd377 100644
--- a/test/langtools/tools/javac/MethodParameters/ClassFileVisitor.java
+++ b/test/langtools/tools/javac/MethodParameters/ClassFileVisitor.java
@@ -29,7 +29,7 @@
/**
* The {@code ClassFileVisitor} reads a class file using the
- * {@code jdk.internal.classfile} library. It iterates over the methods
+ * {@code java.lang.classfile} library. It iterates over the methods
* in a class, and checks MethodParameters attributes against JLS
* requirements, as well as assumptions about the javac implementations.
* <p>
diff --git a/test/langtools/tools/javac/MethodParameters/Constructors.java b/test/langtools/tools/javac/MethodParameters/Constructors.java
index a797b40db5e..27c146ad049 100644
--- a/test/langtools/tools/javac/MethodParameters/Constructors.java
+++ b/test/langtools/tools/javac/MethodParameters/Constructors.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters Constructors.java
* @run main MethodParametersTester Constructors Constructors.out
diff --git a/test/langtools/tools/javac/MethodParameters/EnumTest.java b/test/langtools/tools/javac/MethodParameters/EnumTest.java
index 0f706e7e02d..f7570644ecd 100644
--- a/test/langtools/tools/javac/MethodParameters/EnumTest.java
+++ b/test/langtools/tools/javac/MethodParameters/EnumTest.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582 8008658
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters EnumTest.java
* @run main MethodParametersTester EnumTest EnumTest.out
diff --git a/test/langtools/tools/javac/MethodParameters/InstanceMethods.java b/test/langtools/tools/javac/MethodParameters/InstanceMethods.java
index e84f12245c7..c3d45270c8e 100644
--- a/test/langtools/tools/javac/MethodParameters/InstanceMethods.java
+++ b/test/langtools/tools/javac/MethodParameters/InstanceMethods.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters InstanceMethods.java
* @run main MethodParametersTester InstanceMethods InstanceMethods.out
diff --git a/test/langtools/tools/javac/MethodParameters/LambdaTest.java b/test/langtools/tools/javac/MethodParameters/LambdaTest.java
index 252c9487ce4..cad796a12fd 100644
--- a/test/langtools/tools/javac/MethodParameters/LambdaTest.java
+++ b/test/langtools/tools/javac/MethodParameters/LambdaTest.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582 8037546 8138729
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters LambdaTest.java
* @run main MethodParametersTester LambdaTest LambdaTest.out
diff --git a/test/langtools/tools/javac/MethodParameters/LegacyOutputTest/LegacyOutputTest.java b/test/langtools/tools/javac/MethodParameters/LegacyOutputTest/LegacyOutputTest.java
index dad79da509e..b2e0c6eac70 100644
--- a/test/langtools/tools/javac/MethodParameters/LegacyOutputTest/LegacyOutputTest.java
+++ b/test/langtools/tools/javac/MethodParameters/LegacyOutputTest/LegacyOutputTest.java
@@ -26,8 +26,6 @@
* @test
* @bug 8190452
* @summary javac should not add MethodParameters attributes to v51 and earlier class files
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build LegacyOutputTest
* @run main LegacyOutputTest
*/
diff --git a/test/langtools/tools/javac/MethodParameters/LocalClassTest.java b/test/langtools/tools/javac/MethodParameters/LocalClassTest.java
index 061e2213a4c..554ed798316 100644
--- a/test/langtools/tools/javac/MethodParameters/LocalClassTest.java
+++ b/test/langtools/tools/javac/MethodParameters/LocalClassTest.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582 8008658
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters LocalClassTest.java
* @run main MethodParametersTester LocalClassTest LocalClassTest.out
diff --git a/test/langtools/tools/javac/MethodParameters/MemberClassTest.java b/test/langtools/tools/javac/MethodParameters/MemberClassTest.java
index 940d30da40c..b0ea9c9fbee 100644
--- a/test/langtools/tools/javac/MethodParameters/MemberClassTest.java
+++ b/test/langtools/tools/javac/MethodParameters/MemberClassTest.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582 8008658
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters MemberClassTest.java
* @run main MethodParametersTester MemberClassTest MemberClassTest.out
diff --git a/test/langtools/tools/javac/MethodParameters/StaticMethods.java b/test/langtools/tools/javac/MethodParameters/StaticMethods.java
index a6c0d8aa5d0..24cadb6ca36 100644
--- a/test/langtools/tools/javac/MethodParameters/StaticMethods.java
+++ b/test/langtools/tools/javac/MethodParameters/StaticMethods.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters StaticMethods.java
* @run main MethodParametersTester StaticMethods StaticMethods.out
diff --git a/test/langtools/tools/javac/MethodParameters/UncommonParamNames.java b/test/langtools/tools/javac/MethodParameters/UncommonParamNames.java
index ae17d90150d..f531db7a09a 100644
--- a/test/langtools/tools/javac/MethodParameters/UncommonParamNames.java
+++ b/test/langtools/tools/javac/MethodParameters/UncommonParamNames.java
@@ -25,8 +25,6 @@
* @test
* @bug 8006582
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build MethodParametersTester ClassFileVisitor ReflectionVisitor
* @compile -parameters UncommonParamNames.java
* @run main MethodParametersTester UncommonParamNames UncommonParamNames.out
diff --git a/test/langtools/tools/javac/MethodParametersTest.java b/test/langtools/tools/javac/MethodParametersTest.java
index a4d55525e60..8636d8bfc61 100644
--- a/test/langtools/tools/javac/MethodParametersTest.java
+++ b/test/langtools/tools/javac/MethodParametersTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8004727
* @summary javac should generate method parameters correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.code
+ * @modules jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.comp
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/NoStringToLower.java b/test/langtools/tools/javac/NoStringToLower.java
index 64e68aad1de..ed787c759f4 100644
--- a/test/langtools/tools/javac/NoStringToLower.java
+++ b/test/langtools/tools/javac/NoStringToLower.java
@@ -25,8 +25,6 @@
* @test
* @bug 8029800
* @summary String.toLowerCase()/toUpperCase is generally dangerous, check it is not used in langtools
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.io.*;
@@ -63,6 +61,7 @@ boolean run(String... args) throws Exception {
"javax.lang.model",
"javax.tools",
"com.sun.source",
+ "java.lang.classfile",
"jdk.internal.classfile",
"com.sun.tools.doclint",
"com.sun.tools.javac",
diff --git a/test/langtools/tools/javac/RequiredParameterFlags/ImplicitParameters.java b/test/langtools/tools/javac/RequiredParameterFlags/ImplicitParameters.java
index 0eb4d1b8a42..b53238ce4e5 100644
--- a/test/langtools/tools/javac/RequiredParameterFlags/ImplicitParameters.java
+++ b/test/langtools/tools/javac/RequiredParameterFlags/ImplicitParameters.java
@@ -26,11 +26,9 @@
* @bug 8292275
* @summary check that implicit parameter flags are available by default
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.code
- * java.base/jdk.internal.classfile.impl
* @run main ImplicitParameters
*/
diff --git a/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java b/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
index 8ec49a17c4d..f4fed6fe68b 100644
--- a/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
+++ b/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
@@ -39,7 +39,6 @@
* @bug 8148483 8151516 8151223
* @summary Test that StringConcat is working for JDK >= 9
* @library /tools/lib /test/lib
- * @enablePreview
* @run main TestIndyStringConcat
*/
public class TestIndyStringConcat {
diff --git a/test/langtools/tools/javac/StringConcat/WellKnownTypeSignatures.java b/test/langtools/tools/javac/StringConcat/WellKnownTypeSignatures.java
index 174e9721f3f..2d3d25dde5e 100644
--- a/test/langtools/tools/javac/StringConcat/WellKnownTypeSignatures.java
+++ b/test/langtools/tools/javac/StringConcat/WellKnownTypeSignatures.java
@@ -34,8 +34,6 @@
* @test
* @bug 8273914
* @summary Indy string concat changes order of operations
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*
* @clean *
* @compile -XDstringConcat=indy WellKnownTypeSignatures.java
diff --git a/test/langtools/tools/javac/StringConcat/WellKnownTypes.java b/test/langtools/tools/javac/StringConcat/WellKnownTypes.java
index 470182bc04e..8c20117a756 100644
--- a/test/langtools/tools/javac/StringConcat/WellKnownTypes.java
+++ b/test/langtools/tools/javac/StringConcat/WellKnownTypes.java
@@ -25,7 +25,6 @@
* @test
* @bug 8273914
* @summary Indy string concat changes order of operations
- * @enablePreview
*
* @compile -XDstringConcat=indy WellKnownTypes.java
* @run main WellKnownTypes
diff --git a/test/langtools/tools/javac/StringConcat/access/Test.java b/test/langtools/tools/javac/StringConcat/access/Test.java
index c4aa54618ea..d9d7332e876 100644
--- a/test/langtools/tools/javac/StringConcat/access/Test.java
+++ b/test/langtools/tools/javac/StringConcat/access/Test.java
@@ -34,7 +34,6 @@
* @test
* @bug 8151223
* @summary String concatenation fails with implicit toString() on package-private class
- * @enablePreview
*
* @clean *
* @compile -XDstringConcat=indy Holder.java PublicClass.java PublicInterface.java Public_PublicClass.java Public_PublicInterface.java Public_PrivateInterface1.java Public_PrivateInterface2.java Test.java
diff --git a/test/langtools/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java b/test/langtools/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java
index bb486b32382..b842f1a54ff 100644
--- a/test/langtools/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java
+++ b/test/langtools/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java
@@ -26,9 +26,7 @@
* @bug 6695379
* @summary Copy method annotations and parameter annotations to synthetic
* bridge methods
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.util
+ * @modules jdk.compiler/com.sun.tools.javac.util
* @run main AnnotationsAreNotCopiedToBridgeMethodsTest
*/
diff --git a/test/langtools/tools/javac/T6970173/DebugPointerAtBadPositionTest.java b/test/langtools/tools/javac/T6970173/DebugPointerAtBadPositionTest.java
index 56813905ca5..070d45d2be3 100644
--- a/test/langtools/tools/javac/T6970173/DebugPointerAtBadPositionTest.java
+++ b/test/langtools/tools/javac/T6970173/DebugPointerAtBadPositionTest.java
@@ -26,9 +26,7 @@
* @bug 6970173
* @summary Debug pointer at bad position
* @library /tools/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* jdk.jdeps/com.sun.tools.javap
diff --git a/test/langtools/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java b/test/langtools/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
index 839c835c800..62bae68ad36 100644
--- a/test/langtools/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
+++ b/test/langtools/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
@@ -26,9 +26,7 @@
* @bug 7008643
* @summary inlined finally clauses confuse debuggers
* @library /tools/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* jdk.jdeps/com.sun.tools.javap
diff --git a/test/langtools/tools/javac/T7053059/DoubleCastTest.java b/test/langtools/tools/javac/T7053059/DoubleCastTest.java
index 2aaf5d40f39..4353a119ec7 100644
--- a/test/langtools/tools/javac/T7053059/DoubleCastTest.java
+++ b/test/langtools/tools/javac/T7053059/DoubleCastTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8015499
* @summary javac, Gen is generating extra checkcast instructions in some corner cases
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.util
+ * @modules jdk.compiler/com.sun.tools.javac.util
* @run main DoubleCastTest
*/
diff --git a/test/langtools/tools/javac/T7093325.java b/test/langtools/tools/javac/T7093325.java
index 4c3bb5d77df..0b527794c1a 100644
--- a/test/langtools/tools/javac/T7093325.java
+++ b/test/langtools/tools/javac/T7093325.java
@@ -26,10 +26,8 @@
* @bug 7093325 8006694 8129962
* @summary Redundant entry in bytecode exception table
* temporarily workaround combo tests are causing time out in several platforms
- * @enablePreview
* @library /tools/javac/lib
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.util
* @build combo.ComboTestHelper
diff --git a/test/langtools/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java b/test/langtools/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java
index d7b823d94ec..493dbab113d 100644
--- a/test/langtools/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java
+++ b/test/langtools/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 7165659
* @summary javac incorrectly sets strictfp access flag on inner-classes
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.util
*/
diff --git a/test/langtools/tools/javac/T8003967/DetectMutableStaticFields.java b/test/langtools/tools/javac/T8003967/DetectMutableStaticFields.java
index 2f10e510b0c..ee170ec939e 100644
--- a/test/langtools/tools/javac/T8003967/DetectMutableStaticFields.java
+++ b/test/langtools/tools/javac/T8003967/DetectMutableStaticFields.java
@@ -25,9 +25,7 @@
* @test
* @bug 8003967
* @summary detect and remove all mutable implicit static enum fields in langtools
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.util
+ * @modules jdk.compiler/com.sun.tools.javac.util
* @run main DetectMutableStaticFields
*/
@@ -69,11 +67,11 @@ public class DetectMutableStaticFields {
"javax.tools",
"javax.lang.model",
"com.sun.source",
- "jdk.internal.classfile",
- "jdk.internal.classfile.attribute",
- "jdk.internal.classfile.constantpool",
- "jdk.internal.classfile.instruction",
- "jdk.internal.classfile.components",
+ "java.lang.classfile",
+ "java.lang.classfile.attribute",
+ "java.lang.classfile.constantpool",
+ "java.lang.classfile.instruction",
+ "java.lang.classfile.components",
"jdk.internal.classfile.impl",
"com.sun.tools.javac",
"com.sun.tools.javah",
diff --git a/test/langtools/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java b/test/langtools/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java
index 81879a5f2a0..a72c768aaef 100644
--- a/test/langtools/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java
+++ b/test/langtools/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java
@@ -26,9 +26,7 @@
* @bug 8010737
* @summary javac, known parameter's names should be copied to automatically
* generated constructors for inner classes
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.tree
* jdk.compiler/com.sun.tools.javac.util
@@ -143,9 +141,6 @@ void checkInitSymbol(
Arrays.asList(new File(System.getProperty("test.src"),
this.getClass().getName() + ".java")));
java.util.List<String> options = Arrays.asList(
- "--enable-preview",
- "--source", String.valueOf(Runtime.version().feature()),
- "--add-exports", "java.base/jdk.internal.classfile.impl=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
diff --git a/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java b/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java
index 2957bdd20e7..4f32bc090c3 100644
--- a/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java
+++ b/test/langtools/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 8011181
* @summary javac, empty UTF8 entry generated for inner class
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.util
*/
diff --git a/test/langtools/tools/javac/T8019486/WrongLNTForLambdaTest.java b/test/langtools/tools/javac/T8019486/WrongLNTForLambdaTest.java
index 4ddc40fa231..c916089f4ed 100644
--- a/test/langtools/tools/javac/T8019486/WrongLNTForLambdaTest.java
+++ b/test/langtools/tools/javac/T8019486/WrongLNTForLambdaTest.java
@@ -26,11 +26,9 @@
* @bug 8019486 8026861 8027142
* @summary javac, generates erroneous LVT for a test case with lambda code
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main WrongLNTForLambdaTest
*/
diff --git a/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java b/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java
index 8dd87820423..1870cc4cfa1 100644
--- a/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java
+++ b/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8022186 8271254
* @summary javac generates dead code if a try with an empty body has a finalizer
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.util
+ * @modules jdk.compiler/com.sun.tools.javac.util
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java b/test/langtools/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java
index 36afea59094..df6c32dcd48 100644
--- a/test/langtools/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java
+++ b/test/langtools/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java
@@ -26,11 +26,9 @@
* @bug 8024039
* @summary javac, previous solution for JDK-8022186 was incorrect
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main NoDeadCodeGenerationOnTrySmtTest
*/
diff --git a/test/langtools/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java b/test/langtools/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java
index 150b0fc8c7c..759b78cb929 100644
--- a/test/langtools/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java
+++ b/test/langtools/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 8028504
* @summary javac generates LocalVariableTable even with -g:none
- * @enablePreview
* @compile -g:none DontGenerateLVTForGNoneOpTest.java
* @run main DontGenerateLVTForGNoneOpTest
*/
diff --git a/test/langtools/tools/javac/T8180141/MissingLNTEntryForBreakContinueTest.java b/test/langtools/tools/javac/T8180141/MissingLNTEntryForBreakContinueTest.java
index 1a095ab5301..ad33759899f 100644
--- a/test/langtools/tools/javac/T8180141/MissingLNTEntryForBreakContinueTest.java
+++ b/test/langtools/tools/javac/T8180141/MissingLNTEntryForBreakContinueTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8180141
* @summary Missing entry in LineNumberTable for break statement that jumps out of try-finally
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.code
+ * @modules jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.comp
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java b/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java
index 1cd9ee211e0..1da6fa5e121 100644
--- a/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java
+++ b/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8180141
* @summary Missing entry in LineNumberTable for break statement that jumps out of try-finally
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.code
+ * @modules jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.comp
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/T8187805/BogusRTTAForUnusedVarTest.java b/test/langtools/tools/javac/T8187805/BogusRTTAForUnusedVarTest.java
index aebc8a570d5..bf20746c738 100644
--- a/test/langtools/tools/javac/T8187805/BogusRTTAForUnusedVarTest.java
+++ b/test/langtools/tools/javac/T8187805/BogusRTTAForUnusedVarTest.java
@@ -24,9 +24,7 @@
/*
* @test 8187805
* @summary bogus RuntimeVisibleTypeAnnotations for unused local in a block
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.util
+ * @modules jdk.compiler/com.sun.tools.javac.util
* @run main BogusRTTAForUnusedVarTest
*/
diff --git a/test/langtools/tools/javac/T8203892/CheckTargetIsNotAddedAsMarkerInterfaceTest.java b/test/langtools/tools/javac/T8203892/CheckTargetIsNotAddedAsMarkerInterfaceTest.java
index f123399c8f5..44e6564e49f 100644
--- a/test/langtools/tools/javac/T8203892/CheckTargetIsNotAddedAsMarkerInterfaceTest.java
+++ b/test/langtools/tools/javac/T8203892/CheckTargetIsNotAddedAsMarkerInterfaceTest.java
@@ -25,9 +25,7 @@
* @test 8203892
* @summary Target interface added as marker interface in calls to altMetafactory
* @library /tools/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* jdk.jdeps/com.sun.tools.javap
diff --git a/test/langtools/tools/javac/T8209173/CodeCompletionExceptTest.java b/test/langtools/tools/javac/T8209173/CodeCompletionExceptTest.java
index e18761fe5d1..e506340ab0a 100644
--- a/test/langtools/tools/javac/T8209173/CodeCompletionExceptTest.java
+++ b/test/langtools/tools/javac/T8209173/CodeCompletionExceptTest.java
@@ -26,9 +26,7 @@
* @bug 8209173
* @summary javac fails with completion exception while reporting an error
* @library /tools/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* jdk.jdeps/com.sun.tools.javap
diff --git a/test/langtools/tools/javac/T8210435/NoLocalsMustBeReservedForDCEedVarsTest.java b/test/langtools/tools/javac/T8210435/NoLocalsMustBeReservedForDCEedVarsTest.java
index 35ccb627b44..225b105664e 100644
--- a/test/langtools/tools/javac/T8210435/NoLocalsMustBeReservedForDCEedVarsTest.java
+++ b/test/langtools/tools/javac/T8210435/NoLocalsMustBeReservedForDCEedVarsTest.java
@@ -25,7 +25,6 @@
* @test
* @summary
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/T8222949/TestConstantDynamic.java b/test/langtools/tools/javac/T8222949/TestConstantDynamic.java
index d6f728eda5a..007e7648d40 100644
--- a/test/langtools/tools/javac/T8222949/TestConstantDynamic.java
+++ b/test/langtools/tools/javac/T8222949/TestConstantDynamic.java
@@ -26,9 +26,7 @@
* @bug 8222949
* @summary add condy support to javac's pool API
* @library /tools/javac/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.jvm
diff --git a/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java b/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
index 4c1e3a48275..1f2230493e4 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
@@ -26,8 +26,6 @@
* @bug 8194978
* @summary Verify than an appropriate number of close method invocations is generated.
* @library /tools/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox TwrSimpleClose
* @run main TwrSimpleClose
*/
diff --git a/test/langtools/tools/javac/annotations/ApplicableAnnotationsOnRecords.java b/test/langtools/tools/javac/annotations/ApplicableAnnotationsOnRecords.java
index 0bc65af8aa1..75e8d57fdad 100644
--- a/test/langtools/tools/javac/annotations/ApplicableAnnotationsOnRecords.java
+++ b/test/langtools/tools/javac/annotations/ApplicableAnnotationsOnRecords.java
@@ -26,9 +26,7 @@
* @summary test for com.sun.tools.javac.comp.Check::validateAnnotation, com.sun.tools.javac.code.SymbolMetadata::removeDeclarationMetadata and ::removeFromCompoundList
* @bug 8241312 8246774
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* @run main ApplicableAnnotationsOnRecords
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/annotations/SyntheticParameters.java b/test/langtools/tools/javac/annotations/SyntheticParameters.java
index b26232c4989..692499a0b8a 100644
--- a/test/langtools/tools/javac/annotations/SyntheticParameters.java
+++ b/test/langtools/tools/javac/annotations/SyntheticParameters.java
@@ -26,8 +26,6 @@
* @bug 8065132
* @summary Test generation of annotations on inner class parameters.
* @library /lib/annotations/
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build annotations.classfile.ClassfileInspector SyntheticParameters
* @run main SyntheticParameters
*/
diff --git a/test/langtools/tools/javac/annotations/parameter/ParameterAnnotations.java b/test/langtools/tools/javac/annotations/parameter/ParameterAnnotations.java
index 395765fcb80..da042001356 100644
--- a/test/langtools/tools/javac/annotations/parameter/ParameterAnnotations.java
+++ b/test/langtools/tools/javac/annotations/parameter/ParameterAnnotations.java
@@ -21,11 +21,10 @@
* questions.
*/
-/**
+/*
* @test
* @bug 8024694 8334870
* @summary Check javac can handle various Runtime(In)VisibleParameterAnnotations attribute combinations
- * @enablePreview
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
@@ -641,8 +640,8 @@ private void doTest(Path base, String code, String binaryNameToCheck,
}
Task.Result result = new JavacTask(tb)
+ .processors(new TestAP())
.options("-classpath", classes.toString(),
- "-processor", TestAP.class.getName(),
"-XDrawDiagnostics",
"-Xlint:classfile")
.outdir(classes)
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/CrashOnNonExistingMethodTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/CrashOnNonExistingMethodTest.java
new file mode 100644
index 00000000000..da2174640d9
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/CrashOnNonExistingMethodTest.java
@@ -0,0 +1,22 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8334756
+ * @summary javac crashes on call to non-existent generic method with explicit annotated type arg
+ * @compile/fail/ref=CrashOnNonExistingMethodTest.out -XDrawDiagnostics -XDdev CrashOnNonExistingMethodTest.java
+ */
+
+import static java.lang.annotation.ElementType.TYPE_USE;
+import java.lang.annotation.Target;
+
+class CrashOnNonExistingMethodTest {
+ @Target(TYPE_USE)
+ @interface Nullable {}
+
+ static <T extends @Nullable Object> T identity(T t) {
+ return t;
+ }
+
+ static void test() {
+ CrashOnNonExistingMethodTest.<@Nullable Object>nonNullIdentity(null);
+ }
+}
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/CrashOnNonExistingMethodTest.out b/test/langtools/tools/javac/annotations/typeAnnotations/CrashOnNonExistingMethodTest.out
new file mode 100644
index 00000000000..376c06c93b0
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/CrashOnNonExistingMethodTest.out
@@ -0,0 +1,2 @@
+CrashOnNonExistingMethodTest.java:20:37: compiler.err.cant.resolve.location.args.params: kindname.method, nonNullIdentity, java.lang.Object, compiler.misc.type.null, (compiler.misc.location: kindname.class, CrashOnNonExistingMethodTest, null)
+1 error
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java b/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java
index 6d2aabaee80..190c6372ebc 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java
@@ -26,9 +26,7 @@
* @bug 8246774
* @summary Verify location of type annotations on records
* @library /tools/lib
- * @enablePreview
* @modules
- * java.base/jdk.internal.classfile.impl
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.code
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/VariablesDeclaredWithVarTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/VariablesDeclaredWithVarTest.java
index 7384f4bd5d7..199e56fbf53 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/VariablesDeclaredWithVarTest.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/VariablesDeclaredWithVarTest.java
@@ -26,9 +26,7 @@
* @bug 8261205
* @summary check that potentially applicable type annotations are skip if the variable or parameter was declared with var
* @library /tools/lib
- * @enablePreview
* @modules
- * java.base/jdk.internal.classfile.impl
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.code
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnonymousClassTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnonymousClassTest.java
index eb4b5aa2cf7..7a11e5239d1 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnonymousClassTest.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnonymousClassTest.java
@@ -26,10 +26,8 @@
* @bug 8198945 8207018 8207017
* @summary Invalid RuntimeVisibleTypeAnnotations for annotation on anonymous class type parameter
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox toolbox.JavapTask
* @run compile -g AnonymousClassTest.java
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java
index dfe116580b5..7d3f42584ad 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java
@@ -25,8 +25,6 @@
* @test
* @bug 8005085 8005877 8004829 8005681 8006734 8006775
* @summary Combinations of Target ElementTypes on (repeated)type annotations.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java
index 46f5717103a..dda964c3473 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java
@@ -25,8 +25,6 @@
* @test
* @bug 8005085 8005877 8004829 8005681 8006734 8006775 8006507
* @summary Combinations of Target ElementTypes on (repeated)type annotations.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java
index d0a4deef80b..16e2ed0bb5c 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java
@@ -25,9 +25,7 @@
* @test
* @bug 8005085 8005681 8008769 8010015
* @summary Check (repeating)type annotations on lambda usage.
- * @enablePreview
* @modules jdk.jdeps/com.sun.tools.classfile
- * java.base/jdk.internal.classfile.impl
* @run main CombinationsTargetTest3
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java
index 02caa8df615..3a9fdc9270a 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java
@@ -32,8 +32,6 @@
* @test
* @bug 6917130 8006775
* @summary test that optimized away annotations are not emited to classfile
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
public class DeadCode extends ClassfileTestHelper {
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/InstanceInitializer.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/InstanceInitializer.java
index be3ca03c30c..d6a775c2b6c 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/InstanceInitializer.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/InstanceInitializer.java
@@ -29,8 +29,6 @@
* @test
* @bug 8136419 8200301
* @summary test that type annotations on entities in initializers are emitted to classfile
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -XDdeduplicateLambdas=false InstanceInitializer.java
* @run main InstanceInitializer
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java
index f447dde8998..cbaebb4916e 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java
@@ -31,8 +31,6 @@
/*
* @test ClassLiterals
* @summary test that new type arguments are emitted to classfile
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
public class NewTypeArguments extends ClassfileTestHelper{
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java
index ffab642c1d5..65d5a639f35 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java
@@ -34,8 +34,6 @@
* @test NoTargetAnnotations
* @summary test that annotations with no Target meta type is emitted
* only once as declaration annotation
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
public class NoTargetAnnotations extends ClassfileTestHelper {
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Scopes.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Scopes.java
index 35bc576a2ca..4025a61be6a 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Scopes.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Scopes.java
@@ -32,8 +32,6 @@
* @test
* @bug 6843077 8006775
* @summary Qualified inner type annotation accessible to the class.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
@Scopes.UniqueInner
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/StaticInitializer.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/StaticInitializer.java
index 80341544789..b44faa4d6cf 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/StaticInitializer.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/StaticInitializer.java
@@ -30,8 +30,6 @@
* @test
* @bug 8136419 8200301
* @summary test that type annotations on entities in static initializers are emitted to classfile
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -XDdeduplicateLambdas=false StaticInitializer.java
* @run main StaticInitializer
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java
index 4b8d317d771..cc2dcf8277f 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java
@@ -25,8 +25,6 @@
* @test SyntheticParameters
* @summary Test generation of annotations on inner class parameters.
* @library /lib/annotations/
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @run main SyntheticParameters
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008762.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008762.java
index 5dae330b193..4dbff9cd68f 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008762.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008762.java
@@ -26,8 +26,6 @@
* @bug 8008762
* @summary Type annotation on inner class in anonymous class
* shows up as regular annotation
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.annotation.*;
import static java.lang.annotation.RetentionPolicy.*;
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008769.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008769.java
index fc9ffdfef1d..0aa41def875 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008769.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8008769.java
@@ -26,8 +26,6 @@
* @summary Repeated type-annotations on type parm of local variable
* are not written to classfile.
* @bug 8008769
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.annotation.*;
import static java.lang.annotation.RetentionPolicy.*;
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8010015.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8010015.java
index 635f4ce9fb2..045c75fa39f 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8010015.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/T8010015.java
@@ -25,8 +25,6 @@
* @test
* @summary Wrong classfile attribution in inner class of lambda expression.
* @bug 8010015
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.annotation.*;
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java
index fc232d06b64..efb78c02ad3 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java
@@ -32,9 +32,6 @@
* annotation place on type of element (a FIELD&TYPE_USE element on a field
* results in 2). Elements with no annotations expect 0.
* Source template is read in from testanoninner.template
- *
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.classfile.*;
import java.lang.classfile.attribute.*;
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java
index 048c1836664..ea4f69ecaca 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java
@@ -25,8 +25,6 @@
* @test
* @bug 8005681
* @summary Repeated annotations on new,array,cast.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.classfile.*;
import java.lang.classfile.attribute.*;
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeAnnotationPropagationTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeAnnotationPropagationTest.java
index 9f7873bb2c0..46f9ba18e9b 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeAnnotationPropagationTest.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeAnnotationPropagationTest.java
@@ -25,8 +25,6 @@
* @test
* @bug 8144185
* @summary javac produces incorrect RuntimeInvisibleTypeAnnotations length attribute
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import static java.lang.annotation.ElementType.TYPE_USE;
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java
index 04907df1203..9a0ed02ae28 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java
@@ -33,7 +33,6 @@
* @bug 6843077 8006775
* @summary test that typecasts annotation are emitted if only the cast
* expression is optimized away
- * @enablePreview
*/
public class TypeCasts extends ClassfileTestHelper{
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java
index 31d9294f120..3295d0a513b 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java
@@ -32,7 +32,6 @@
* @test Wildcards
* @bug 6843077 8006775
* @summary test that annotations target wildcards get emitted to classfile
- * @enablePreview
*/
public class Wildcards extends ClassfileTestHelper {
public static void main(String[] args) throws Exception {
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java
index 8607b1cc312..c4581fc1bf3 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451 8164519
* @summary Test population of reference info for class extends clauses
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java ClassExtends.java
* @run main Driver ClassExtends
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java
index 696d3b32929..2202766e450 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for class type parameters
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java ClassTypeParam.java
* @run main Driver ClassTypeParam
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java
index bcffb424827..f89ec2efce4 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java
@@ -25,8 +25,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for constructor invocation type argument
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java ConstructorInvocationTypeArgument.java
* @run main Driver ConstructorInvocationTypeArgument
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java
index beab5ea9fb5..89128a60888 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java
@@ -25,8 +25,6 @@
* @test
* @bug 8026791 8042451
* @summary Test population of reference info for constructor results
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java Constructors.java
* @run main Driver Constructors
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
index b479f7dcfdc..e179764a1e8 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
@@ -28,8 +28,6 @@
* @bug 8028576 8042451
* @summary Test population of reference info for exception parameters
* @author Werner Dietl
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java ExceptionParameters.java
* @run main Driver ExceptionParameters
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java
index 7a77ac2390b..089f32ae775 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java
@@ -25,8 +25,6 @@
* @test
* @bug 8042451 8208470
* @summary Test population of reference info for field
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java Fields.java
* @run main Driver Fields
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java
index b52a20353d8..b89517c4376 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test that the examples from the manual are stored as expected
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java FromSpecification.java
* @run main Driver FromSpecification
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java
index 706edb453b1..70af9591900 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java
@@ -28,8 +28,6 @@
* @bug 8013852 8042451
* @summary Test population of reference info for instance and class initializers
* @author Werner Dietl
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java Initializers.java
* @run main Driver Initializers
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
index 690f0ddc186..1d78183e68e 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
@@ -26,8 +26,6 @@
* @bug 8008077 8029721 8042451 8043974
* @summary Test population of reference info for lambda expressions
* javac crash for annotated parameter type of lambda in a field
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @ignore 8057687 emit correct byte code an attributes for type annotations
* @compile -g Driver.java ReferenceInfoUtil.java Lambda.java
* @run main Driver Lambda
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java
index f0df24e3805..38026251a19 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java
@@ -25,8 +25,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for method invocation type arguments
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java MethodInvocationTypeArgument.java
* @run main Driver MethodInvocationTypeArgument
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
index 2f5b6d43636..edc9ae18a32 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for method parameters
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java MethodParameters.java
* @run main Driver MethodParameters
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java
index faae9c91c04..d379301005f 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for method receivers
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java MethodReceivers.java
* @run main Driver MethodReceivers
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java
index ee7248db119..b174ea414c4 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for method return
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java MethodReturns.java
* @run main Driver MethodReturns
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java
index 546b8cdeb0a..69de815909e 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for method exception clauses
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java MethodThrows.java
* @run main Driver MethodThrows
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java
index fa6203e3fff..05a8c09c1cf 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java
@@ -28,8 +28,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for method type parameters
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java MethodTypeParam.java
* @run main Driver MethodTypeParam
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java
index a3d927a0fb9..a1883ff4864 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java
@@ -28,8 +28,6 @@
* @bug 8006732 8006775 8042451
* @summary Test population of reference info for multicatch exception parameters
* @author Werner Dietl
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java MultiCatch.java
* @run main Driver MultiCatch
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
index f3b54ff35a1..37aedf75f62 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451 8044009 8044010
* @summary Test population of reference info for nested types
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @ignore 8057687 emit correct byte code an attributes for type annotations
* @compile -g Driver.java ReferenceInfoUtil.java NestedTypes.java
* @run main Driver NestedTypes
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java
index 0ed41448fb4..983901af225 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for new object creations
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java NewObjects.java
* @run main Driver NewObjects
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java
index 70cb3a94bd8..1d78cfed508 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java
@@ -26,8 +26,6 @@
/*
* @test
* @summary Test population of reference info for repeating type annotations
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java RepeatingTypeAnnotations.java
* @run main Driver RepeatingTypeAnnotations
* @author Werner Dietl
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java
index e1be3ea1435..bb5944d400c 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java
@@ -25,8 +25,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for resource variable
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java ResourceVariable.java
* @run main Driver ResourceVariable
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
index 9afaffe0bf1..612601538b6 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for type casts
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java TypeCasts.java
* @run main Driver TypeCasts
*/
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java
index 5cbb6a370fa..e82c5f4009a 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java
@@ -27,8 +27,6 @@
* @test
* @bug 8042451
* @summary Test population of reference info for class literals
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g Driver.java ReferenceInfoUtil.java TypeTests.java
* @run main Driver TypeTests
*/
diff --git a/test/langtools/tools/javac/cast/intersection/DuplicatedCheckcastTest.java b/test/langtools/tools/javac/cast/intersection/DuplicatedCheckcastTest.java
index 544314832e8..0bf600044b1 100644
--- a/test/langtools/tools/javac/cast/intersection/DuplicatedCheckcastTest.java
+++ b/test/langtools/tools/javac/cast/intersection/DuplicatedCheckcastTest.java
@@ -21,16 +21,14 @@
* questions.
*/
-/**
+/*
* @test
* @bug 8263642 8268885
* @summary javac should not emit duplicate checkcast for first bound of intersection type in cast
* duplicate checkcast when destination type is not first type of intersection type
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main DuplicatedCheckcastTest
*/
diff --git a/test/langtools/tools/javac/classfiles/InnerClasses/SyntheticClasses.java b/test/langtools/tools/javac/classfiles/InnerClasses/SyntheticClasses.java
index 9ca04ef3718..f4946b47bf5 100644
--- a/test/langtools/tools/javac/classfiles/InnerClasses/SyntheticClasses.java
+++ b/test/langtools/tools/javac/classfiles/InnerClasses/SyntheticClasses.java
@@ -25,8 +25,6 @@
* @bug 8034854
* @summary Verify that the InnerClasses attribute has outer_class_info_index zero if it has
* inner_name_index zero (for synthetic classes)
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile SyntheticClasses.java
* @run main SyntheticClasses
*/
diff --git a/test/langtools/tools/javac/classfiles/T8255757/T8255757.java b/test/langtools/tools/javac/classfiles/T8255757/T8255757.java
index 231a132e579..b165967bf5e 100644
--- a/test/langtools/tools/javac/classfiles/T8255757/T8255757.java
+++ b/test/langtools/tools/javac/classfiles/T8255757/T8255757.java
@@ -26,10 +26,8 @@
* @bug 8255757
* @summary Javac shouldn't emit duplicate pool entries on array::clone
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main T8255757
*/
diff --git a/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java b/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java
index 2911e58820f..f67fa87474e 100644
--- a/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java
@@ -26,7 +26,6 @@
* @bug 8042947
* @summary Checking AnnotationDefault attribute.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java b/test/langtools/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java
index 924916f5cbd..69a40ddbf45 100644
--- a/test/langtools/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java
@@ -26,7 +26,6 @@
* @bug 8042931 8215470
* @summary Checking EnclosingMethod attribute of anonymous/local class.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java
index 8312b535f50..3d3d4f69d0a 100644
--- a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java
@@ -26,7 +26,6 @@
* @summary Tests a line number table attribute for language constructions in different containers.
* @bug 8040131
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/MultipleRecordPatterns.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/MultipleRecordPatterns.java
index 53a60b69cb0..b2b3e1e8a2c 100644
--- a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/MultipleRecordPatterns.java
+++ b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/MultipleRecordPatterns.java
@@ -26,7 +26,6 @@
* @bug 8307814
* @summary Verify correct LineNumberTable is generated for unrolled record patterns.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/RuleSwitchBreaks.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/RuleSwitchBreaks.java
index 58f1386a000..a1bb8a6150c 100644
--- a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/RuleSwitchBreaks.java
+++ b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/RuleSwitchBreaks.java
@@ -26,7 +26,6 @@
* @bug 8262891
* @summary Verify correct LineNumberTable for rule switches.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/StringSwitchBreaks.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/StringSwitchBreaks.java
index e22a847370b..e445818553e 100644
--- a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/StringSwitchBreaks.java
+++ b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/StringSwitchBreaks.java
@@ -26,7 +26,6 @@
* @bug 8261606
* @summary Tests a line number table attribute for language constructions in different containers.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8050993.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8050993.java
index 934a0ef09e7..5c8af7e3a71 100644
--- a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8050993.java
+++ b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8050993.java
@@ -2,8 +2,6 @@
* @test /nodynamiccopyright/
* @bug 8050993
* @summary Verify that the condition in the conditional lexpression gets a LineNumberTable entry
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g T8050993.java
* @run main T8050993
*/
diff --git a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8314275.java b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8314275.java
index 07a1e7c7575..d17ae238704 100644
--- a/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8314275.java
+++ b/test/langtools/tools/javac/classfiles/attributes/LineNumberTable/T8314275.java
@@ -25,7 +25,6 @@
* @bug 8314275
* @summary Tests a line number table attribute for switch expression
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java
index 1139b8d2fde..2ce77364bea 100644
--- a/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java
@@ -26,7 +26,6 @@
* @summary local variable table attribute test.
* @bug 8040097
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java
index 6681231e4b2..0f4ed838edd 100644
--- a/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java
@@ -26,7 +26,6 @@
* @summary local variable type table attribute test.
* @bug 8040097
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java b/test/langtools/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java
index a0e88b7c602..2dcee4d16e1 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java
@@ -26,11 +26,9 @@
* @bug 8080878
* @summary Checking ACC_MODULE flag is generated for module-info.
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask toolbox.ToolBox
* @run main ModuleFlagTest
*/
diff --git a/test/langtools/tools/javac/classfiles/attributes/Module/ModuleTest.java b/test/langtools/tools/javac/classfiles/attributes/Module/ModuleTest.java
index c6a329b7d0b..cf09ce7ca39 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Module/ModuleTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Module/ModuleTest.java
@@ -25,12 +25,10 @@
* @test
* @summary Module attribute tests
* @bug 8080878 8161906 8162713 8170250
- * @enablePreview
* @modules java.compiler
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib ../lib /tools/javac/lib
* @build toolbox.ToolBox toolbox.JavacTask toolbox.ToolBox
* TestBase TestResult ModuleTestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/Signature/ConstructorTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/ConstructorTest.java
index ae6b5f740c4..20012318ea7 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Signature/ConstructorTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Signature/ConstructorTest.java
@@ -26,7 +26,6 @@
* @bug 8049238
* @summary Checks Signature attribute for constructors.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/Signature/EnumTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/EnumTest.java
index 661b3405735..b7e6d2ca99a 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Signature/EnumTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Signature/EnumTest.java
@@ -26,7 +26,6 @@
* @bug 8049238
* @summary Checks Signature attribute for enum.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/Signature/ExceptionTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/ExceptionTest.java
index d15efea17df..54706e2822b 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Signature/ExceptionTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Signature/ExceptionTest.java
@@ -26,7 +26,6 @@
* @bug 8049238
* @summary Checks Signature attribute for methods which throw exceptions.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/Signature/FieldTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/FieldTest.java
index e5a7dfa480e..795a4d30bea 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Signature/FieldTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Signature/FieldTest.java
@@ -26,7 +26,6 @@
* @bug 8049238
* @summary Checks Signature attribute for fields.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/Signature/InnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/InnerClassTest.java
index ae3670aca03..740607d56c0 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Signature/InnerClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Signature/InnerClassTest.java
@@ -26,7 +26,6 @@
* @bug 8049238
* @summary Checks Signature attribute for inner classes.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java
index 3444cc14ce7..6966ed1852c 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java
@@ -26,7 +26,6 @@
* @bug 8049238
* @summary Checks Signature attribute for method parameters.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java
index 51e668779b6..2131b5a4f02 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java
@@ -26,7 +26,6 @@
* @bug 8049238
* @summary Checks Signature attribute for type bounds.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java b/test/langtools/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java
index e805baca82a..cce155bbb71 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java
@@ -26,7 +26,6 @@
* @bug 8049238
* @summary Checks Signature attribute for array return type of method.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules java.desktop
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java
index 63eb7369ff0..15696c89bee 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java
@@ -26,7 +26,6 @@
* @summary sourcefile attribute test for anonymous class.
* @bug 8040129
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java
index e2442f421d8..d8cd067408f 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java
@@ -26,7 +26,6 @@
* @summary sourcefile attribute test for inner class.
* @bug 8040129
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java
index a5b44936ede..dc45a92d407 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java
@@ -26,7 +26,6 @@
* @summary sourcefile attribute test for local class.
* @bug 8040129
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/MixTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/MixTest.java
index 1c7aae4ae0f..d2079bb13f9 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/MixTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/MixTest.java
@@ -26,7 +26,6 @@
* @summary sourcefile attribute test for complex structure of nested classes and other types.
* @bug 8040129
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java
index 886ee032ed2..d0b65e41cfe 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java
@@ -26,7 +26,6 @@
* @summary sourcefile attribute test for module-info.
* @bug 8080878
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java
index d4a4972f135..4e4b2faacd2 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java
@@ -26,7 +26,6 @@
* @summary sourcefile attribute test for file compiled without debug information.
* @bug 8040129
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
index 33f55545d81..07885640f8a 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
@@ -30,7 +30,6 @@
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox InMemoryFileManager TestBase SourceFileTestBase
- * @enablePreview
* @run main SyntheticClassTest
*/
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java
index d29d2ef9600..ee85b2dc650 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java
@@ -26,7 +26,6 @@
* @summary sourcefile attribute test for two type in one file.
* @bug 8040129
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java
index 1c220441d8d..3072b641b69 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java
@@ -25,10 +25,8 @@
* @test
* @bug 8189335
* @summary Synthetic anonymous class used as access constructor tag conflicting with a top level class.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult
* @build AccessToPrivateInnerClassConstructorsTest SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java
index 3eef2e12ba7..0440ec1a430 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java
@@ -26,10 +26,8 @@
* @bug 8044537
* @summary Checking ACC_SYNTHETIC flag is generated for access method
* generated to access to private methods and fields.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult
* @build AccessToPrivateInnerClassMembersTest SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java
index 94f4af3a1e2..720af8507a8 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java
@@ -26,10 +26,8 @@
* @bug 8044537
* @summary Checking ACC_SYNTHETIC flag is generated for access method
* generated to access to private methods and fields.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @build AccessToPrivateSiblingsTest SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java
index 8015177ff14..508bf245c47 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/AssertFieldTest.java
@@ -25,10 +25,8 @@
* @test
* @bug 8044537
* @summary Checking ACC_SYNTHETIC flag is generated for assert statement.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @build AssertFieldTest SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java
index fedcf817ee3..96c7a41fea9 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodForGenericMethodTest.java
@@ -25,10 +25,8 @@
* @test
* @bug 8044537
* @summary Checking ACC_SYNTHETIC flag is generated for bridge method generated for generic method.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @build BridgeMethodForGenericMethodTest SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
index e4dfb5000f5..db123295f7c 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
@@ -32,11 +32,10 @@
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager
* ExpectedClass ExpectedClasses
- * @compile --enable-preview --source ${jdk.version} --target ${jdk.version}
- * SyntheticTestDriver.java
+ * @compile SyntheticTestDriver.java
* ../lib/TestResult.java ../lib/TestBase.java
* @compile --source 14 -target 14 -XDdeduplicateLambdas=false BridgeMethodsForLambdaTargetRelease14Test.java
- * @run main/othervm --enable-preview SyntheticTestDriver BridgeMethodsForLambdaTargetRelease14Test
+ * @run main SyntheticTestDriver BridgeMethodsForLambdaTargetRelease14Test
*/
import java.util.Comparator;
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java
index 10d93dd7631..5d26990d23d 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java
@@ -26,10 +26,8 @@
* @bug 8044537 8200301 8238358
* @summary Checking ACC_SYNTHETIC flag is generated for bridge method
* generated for lambda expressions and method references.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @build SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/EnumTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/EnumTest.java
index 891f09ae083..d4cfbbe8d19 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/EnumTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/EnumTest.java
@@ -25,10 +25,8 @@
* @test
* @bug 8044537
* @summary Checking ACC_SYNTHETIC flag is generated for enum members.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @build EnumTest SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java
index 108a9a16450..18a3c966546 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/PackageInfoTest.java
@@ -25,10 +25,8 @@
* @test
* @bug 8044537
* @summary Checking ACC_SYNTHETIC flag is generated for package-info.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @build SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java
index ed87191d9c0..7c07628afbd 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java
@@ -25,10 +25,8 @@
* @test
* @bug 8044537
* @summary Checking ACC_SYNTHETIC flag is generated for "this$0" field.
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @build ThisFieldTest SyntheticTestDriver ExpectedClass ExpectedClasses
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java
index 04bf7820b12..7691bc54ba7 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForGenericMethodTest.java
@@ -26,9 +26,7 @@
* @bug 8044411
* @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute.
* Checks that the attribute is generated for bridge method.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java
index ac8069b2a76..c0ca6d2426d 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerAnnotationTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8044411
* @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java
index 2ad55bea369..8fc1aadb276 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerClassTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8044411
* @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java
index c4ee74e8ee3..f699124dca9 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerEnumTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8044411
* @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java
index 5d3bcc519ff..553155fa9f2 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForInnerInterfaceTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8044411
* @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java
index 948b8abfcec..6a80acd406e 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeAnnotationsForTopLevelClassTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8044411
* @summary Tests the RuntimeVisibleAnnotations/RuntimeInvisibleAnnotations attribute.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java
index 2846325dd4a..6e0671c2b23 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForGenericMethodTest.java
@@ -26,9 +26,7 @@
* @bug 8044411
* @summary Tests the RuntimeParameterVisibleAnnotations/RuntimeParameterInvisibleAnnotations attribute.
* Checks that the attribute is generated for bridge method.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java
index ef9bd07cd69..c40ac214bd7 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsForLambdaTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8044411 8079060 8138612
* @summary Tests the RuntimeParameterVisibleAnnotations/RuntimeParameterInvisibleAnnotations attribute.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java
index a62c3a1d989..9443ccc5151 100644
--- a/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/annotations/RuntimeParameterAnnotationsTest.java
@@ -25,9 +25,7 @@
* @test
* @bug 8044411
* @summary Tests the RuntimeParameterVisibleAnnotations/RuntimeParameterInvisibleAnnotations attribute.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
diff --git a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
index b3e7339b240..d2b8c56207f 100644
--- a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
@@ -26,11 +26,9 @@
* @bug 8042261 8298405
* @summary Checking that deprecated attribute does not apply to classes of deprecated package.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @run main DeprecatedPackageTest
*/
diff --git a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
index 6467f3d8027..9a83cb2a920 100644
--- a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
@@ -27,7 +27,6 @@
* @summary Checking what attribute is generated by annotation Deprecated
* or javadoc deprecated for field, method, class(inner/local), interface.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java
index a07a111f024..a7d84a4a599 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner annotations in inner annotation.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java
index f02da8d302a..cdf2413eeec 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner annotations in inner class.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java
index 06ccbdf0725..1b78cbeccec 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner annotations in inner enum.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java
index 7fd6c7bd259..c40b7161d6d 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner annotations in inner interface.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
index 124f46acded..a6210b8455a 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
@@ -26,10 +26,8 @@
* @bug 8042251
* @summary Test that inner classes have in its inner classes attribute enclosing classes and its immediate members.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @run main InnerClassesHierarchyTest
*/
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java
index 2ffd4260418..8287c0dbcd8 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java
@@ -26,7 +26,6 @@
* @bug 8042251 8062373
* @summary Testing InnerClasses_attribute of inner classes in anonymous class.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java
index 9b7be560ed4..f69b0d1a885 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner classes in inner annotation.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java
index df638c9cd91..bd5d27e7307 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java
@@ -26,7 +26,6 @@
* @bug 8034854 8042251
* @summary Testing InnerClasses_attribute of inner classes in inner class.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java
index 9ff973177ab..7bca5b5240f 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java
@@ -26,7 +26,6 @@
* @bug 8034854 8042251
* @summary Testing InnerClasses_attribute of inner classes in inner enum.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java
index 722c1f4951a..3e6d32044cb 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner classes in inner interface.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java
index 9ce99a0f77b..9c40275b6e6 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner classes in local class.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules java.base/jdk.internal.classfile.impl
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java
index 96f2efc6ea6..d8b78622185 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java
@@ -26,10 +26,8 @@
* @bug 8042251
* @summary Test that outer_class_info_index of local and anonymous class is zero.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
* @run main InnerClassesIndexTest
*/
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
index f2901d4c9cb..6225c89e591 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
@@ -26,7 +26,6 @@
* @bug 8034854 8042251
* @summary Testing inner classes attributes.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
index 41d9627b278..43aa1462ca6 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner enums in inner annotation.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java
index 3136cce327d..3c4775d22a7 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner enums in inner enum.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java
index 59d86c3f65a..01beace40ca 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner enums in inner interface.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java
index aeee14b8e90..413bee58f00 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner enums in inner class.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java
index 57f48bd6d3c..ca25c1028f6 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner interfaces in inner annotation.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java
index 522d6077602..c0dac827f81 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java
@@ -26,7 +26,6 @@
* @summary Testing InnerClasses_attribute of inner interfaces in inner class.
* @author aeremeev
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java
index 53136291cfa..5e6051ddd75 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner interfaces in inner enum.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java
index 6f3ea9da4ed..abf8e5987d7 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java
@@ -26,7 +26,6 @@
* @bug 8042251
* @summary Testing InnerClasses_attribute of inner interfaces in inner interface.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* java.base/jdk.internal.classfile.impl
diff --git a/test/langtools/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java b/test/langtools/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java
index 35d65208bc5..e6f29a1d078 100644
--- a/test/langtools/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java
@@ -26,10 +26,8 @@
* @bug 8042251
* @summary Test that there are no inner classes attributes in case of there are no inner classes.
* @library /tools/lib /tools/javac/lib ../lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox InMemoryFileManager TestBase
* @run main NoInnerClassesTest
*/
diff --git a/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java b/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java
index a44adbf6d9e..1523ac59f37 100644
--- a/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java
+++ b/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java
@@ -26,9 +26,7 @@
* @test
* @bug 8171132
* @summary Improve class reading of invalid or out-of-range ConstantValue attributes
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.jvm
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/classreader/BadMethodParameter.java b/test/langtools/tools/javac/classreader/BadMethodParameter.java
index cddd3f24956..56b93183abe 100644
--- a/test/langtools/tools/javac/classreader/BadMethodParameter.java
+++ b/test/langtools/tools/javac/classreader/BadMethodParameter.java
@@ -31,7 +31,6 @@
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @build toolbox.ToolBox toolbox.JavacTask
- * @enablePreview
* @run main BadMethodParameter
*/
@@ -99,9 +98,7 @@ public static void f(int x, int y) {
Path classDir = getClassDir();
new JavacTask(tb)
.classpath(classes, classDir)
- .options("--enable-preview",
- "-source", String.valueOf(Runtime.version().feature()),
- "-verbose", "-parameters", "-processor", P.class.getName())
+ .options("-verbose", "-parameters", "-processor", P.class.getName())
.classes(P.class.getName())
.outdir(classes)
.run(Task.Expect.SUCCESS);
diff --git a/test/langtools/tools/javac/classwriter/IndyCorrectInvocationName.java b/test/langtools/tools/javac/classwriter/IndyCorrectInvocationName.java
index 8b5e4e7b695..3a8be1f53ed 100644
--- a/test/langtools/tools/javac/classwriter/IndyCorrectInvocationName.java
+++ b/test/langtools/tools/javac/classwriter/IndyCorrectInvocationName.java
@@ -27,7 +27,6 @@
* @summary Verify the correct constantpool entries are created for invokedynamic instructions using
* the same bootstrap and type, but different name.
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.comp
@@ -35,7 +34,6 @@
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.tree
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.JarTask toolbox.JavacTask toolbox.JavapTask toolbox.ToolBox
* @run main IndyCorrectInvocationName
diff --git a/test/langtools/tools/javac/code/CharImmediateValue.java b/test/langtools/tools/javac/code/CharImmediateValue.java
index 44e2744b74e..d96fb60a1b7 100644
--- a/test/langtools/tools/javac/code/CharImmediateValue.java
+++ b/test/langtools/tools/javac/code/CharImmediateValue.java
@@ -27,7 +27,6 @@
* @summary Verify constant/immediate char values are correctly enhanced to ints when used in unary
* operators
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.comp
@@ -35,7 +34,6 @@
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.tree
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.JarTask toolbox.JavacTask toolbox.JavapTask toolbox.ToolBox
* @compile CharImmediateValue.java
diff --git a/test/langtools/tools/javac/constDebug/ConstDebugTest.java b/test/langtools/tools/javac/constDebug/ConstDebugTest.java
index 59a6e4daa24..c487ccea269 100644
--- a/test/langtools/tools/javac/constDebug/ConstDebugTest.java
+++ b/test/langtools/tools/javac/constDebug/ConstDebugTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 4645152 4785453
* @summary javac compiler incorrectly inserts <clinit> when -g is specified
- * @enablePreview
* @run compile -g ConstDebugTest.java
* @run main ConstDebugTest
*/
diff --git a/test/langtools/tools/javac/defaultMethods/BadClassfile.java b/test/langtools/tools/javac/defaultMethods/BadClassfile.java
index 589b65bcf66..ed952ea3799 100644
--- a/test/langtools/tools/javac/defaultMethods/BadClassfile.java
+++ b/test/langtools/tools/javac/defaultMethods/BadClassfile.java
@@ -26,9 +26,7 @@
* @bug 8025087
* @summary Verify that pre-JDK8 classfiles with default and/or static methods
* are refused correctly.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @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
diff --git a/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java b/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
index fd321f3a269..398a2eca169 100644
--- a/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
+++ b/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
@@ -26,7 +26,6 @@
* @bug 8012723
* @summary strictfp interface misses strictfp modifer on default method
* @library /tools/lib /test/lib
- * @enablePreview
* @run main CheckACC_STRICTFlagOnDefaultMethodTest
*/
diff --git a/test/langtools/tools/javac/defaultMethods/TestDefaultBody.java b/test/langtools/tools/javac/defaultMethods/TestDefaultBody.java
index ec4e8b7b558..edf8427bc93 100644
--- a/test/langtools/tools/javac/defaultMethods/TestDefaultBody.java
+++ b/test/langtools/tools/javac/defaultMethods/TestDefaultBody.java
@@ -25,8 +25,6 @@
* @test
* @bug 7192246
* @summary check that code attributed for default methods is correctly generated
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java b/test/langtools/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java
index 5d334224dc7..cff1b10a7e5 100644
--- a/test/langtools/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java
+++ b/test/langtools/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java
@@ -25,8 +25,6 @@
* @test
* @bug 7192246
* @summary check that javac does not generate bridge methods for defaults
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java b/test/langtools/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java
index 8be378eaf7b..9aa52686bc4 100644
--- a/test/langtools/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java
+++ b/test/langtools/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java
@@ -25,8 +25,6 @@
* @test
* @bug 8027281
* @summary As per JVMS 4.9.2, invokespecial can only refer to direct superinterfaces
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile TestDirectSuperInterfaceInvoke.java
* @run main TestDirectSuperInterfaceInvoke
*/
diff --git a/test/langtools/tools/javac/diags/CheckResourceKeys.java b/test/langtools/tools/javac/diags/CheckResourceKeys.java
index 8df6cd4d64e..1ec968519cd 100644
--- a/test/langtools/tools/javac/diags/CheckResourceKeys.java
+++ b/test/langtools/tools/javac/diags/CheckResourceKeys.java
@@ -25,10 +25,8 @@
* @test
* @bug 6964768 6964461 6964469 6964487 6964460 6964481 6980021
* @summary need test program to validate javac resource bundles
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.resources:open
- * java.base/jdk.internal.classfile.impl
*/
import java.io.*;
diff --git a/test/langtools/tools/javac/diags/Example.java b/test/langtools/tools/javac/diags/Example.java
index 1c76e429fd6..8940032367d 100644
--- a/test/langtools/tools/javac/diags/Example.java
+++ b/test/langtools/tools/javac/diags/Example.java
@@ -293,17 +293,6 @@ private void run(PrintWriter out, Set<String> keys, boolean raw, boolean verbose
if (procFiles.size() > 0) {
List<String> pOpts = new ArrayList<>(Arrays.asList("-d", classesDir.getPath()));
- // hack to automatically add exports; a better solution would be to grep the
- // source for import statements or a magic comment
- for (File pf: procFiles) {
- if (pf.getName().equals("CreateBadClassFile.java")) {
- pOpts.add("--enable-preview");
- pOpts.add("--source");
- pOpts.add(String.valueOf(Runtime.version().feature()));
- pOpts.add("--add-exports=java.base/jdk.internal.classfile.impl=ALL-UNNAMED");
- }
- }
-
new Jsr199Compiler(verbose).run(null, null, false, pOpts, procFiles);
opts.add("-classpath"); // avoid using -processorpath for now
opts.add(classesDir.getPath());
diff --git a/test/langtools/tools/javac/diags/examples/BadConstantValueType/BadConstantValueType.java b/test/langtools/tools/javac/diags/examples/BadConstantValueType/BadConstantValueType.java
index c8dac3a388d..1a9faf67547 100644
--- a/test/langtools/tools/javac/diags/examples/BadConstantValueType/BadConstantValueType.java
+++ b/test/langtools/tools/javac/diags/examples/BadConstantValueType/BadConstantValueType.java
@@ -25,7 +25,6 @@
// key: compiler.misc.bad.class.file.header
// key: compiler.err.cant.access
// options: -processor CreateBadClassFile
-// run: exec --enable-preview
/* The annotation processor will create an invalid classfile with a static
* final field of type java.lang.Object having ConstantValue attribute with
diff --git a/test/langtools/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java b/test/langtools/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java
index c61e123c647..bae237b09d2 100644
--- a/test/langtools/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java
+++ b/test/langtools/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java
@@ -25,7 +25,6 @@
// key: compiler.misc.bad.class.file.header
// key: compiler.err.cant.access
// options: -processor CreateBadClassFile
-// run: exec --enable-preview
/* The annotation processor will create an invalid classfile with version 51.0
* and a non-abstract method in an interface. Loading the classfile will produce
diff --git a/test/langtools/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java b/test/langtools/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java
index 264b8861107..ba739de15ec 100644
--- a/test/langtools/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java
+++ b/test/langtools/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java
@@ -25,7 +25,6 @@
// key: compiler.misc.bad.class.file.header
// key: compiler.err.cant.access
// options: -processor CreateBadClassFile
-// run: exec --enable-preview
/* The annotation processor will create an invalid classfile with version 51.0
* and a static method in an interface. Loading the classfile will produce
diff --git a/test/langtools/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java b/test/langtools/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java
index e4879302058..57f4fcde3e7 100644
--- a/test/langtools/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java
+++ b/test/langtools/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java
@@ -26,8 +26,6 @@
* @bug 8027789
* @summary check that the direct superclass is used as the site when calling
* a superclass' method
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile Base.java NonDirectSuper.java
* @run main test.NonDirectSuper
*/
diff --git a/test/langtools/tools/javac/file/SymLinkArchiveTest.java b/test/langtools/tools/javac/file/SymLinkArchiveTest.java
index eba933af49e..9cb544244f2 100644
--- a/test/langtools/tools/javac/file/SymLinkArchiveTest.java
+++ b/test/langtools/tools/javac/file/SymLinkArchiveTest.java
@@ -26,10 +26,8 @@
* @bug 8181897
* @summary
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.JavacTask toolbox.TestRunner toolbox.ToolBox
* @run main SymLinkArchiveTest
*/
diff --git a/test/langtools/tools/javac/file/SymLinkShortNameTest.java b/test/langtools/tools/javac/file/SymLinkShortNameTest.java
index 28f25f8b5bf..cb2d4ba058e 100644
--- a/test/langtools/tools/javac/file/SymLinkShortNameTest.java
+++ b/test/langtools/tools/javac/file/SymLinkShortNameTest.java
@@ -26,10 +26,8 @@
* @bug 8193277
* @summary SimpleFileObject inconsistency between getName and getShortName
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.JavacTask toolbox.TestRunner toolbox.ToolBox
* @run main SymLinkShortNameTest
*/
diff --git a/test/langtools/tools/javac/file/SymLinkTest.java b/test/langtools/tools/javac/file/SymLinkTest.java
index 45405aac2ee..ea5295505e1 100644
--- a/test/langtools/tools/javac/file/SymLinkTest.java
+++ b/test/langtools/tools/javac/file/SymLinkTest.java
@@ -28,10 +28,8 @@
* class.public.should.be.in.file diagnostic and SourceFile
* attribute content
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.JavacTask toolbox.TestRunner toolbox.ToolBox
* @run main SymLinkTest
*/
diff --git a/test/langtools/tools/javac/flow/LVTHarness.java b/test/langtools/tools/javac/flow/LVTHarness.java
index cd4374d93e2..3686323567b 100644
--- a/test/langtools/tools/javac/flow/LVTHarness.java
+++ b/test/langtools/tools/javac/flow/LVTHarness.java
@@ -28,8 +28,6 @@
* javac crash while creating LVT entry for a local variable defined in
* an inner block
* @library /tools/javac/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @build JavacTestingAbstractProcessor LVTHarness
* @run main LVTHarness
*/
diff --git a/test/langtools/tools/javac/generics/bridges/BridgeHarness.java b/test/langtools/tools/javac/generics/bridges/BridgeHarness.java
index acf1a3cdef1..25414c8127c 100644
--- a/test/langtools/tools/javac/generics/bridges/BridgeHarness.java
+++ b/test/langtools/tools/javac/generics/bridges/BridgeHarness.java
@@ -26,9 +26,7 @@
* @bug 8013789
* @summary Compiler should emit bridges in interfaces
* @library /tools/javac/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.code
+ * @modules jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.util
* @build JavacTestingAbstractProcessor BridgeHarness
* @run main BridgeHarness
diff --git a/test/langtools/tools/javac/importscope/T8193717.java b/test/langtools/tools/javac/importscope/T8193717.java
index bb2f0e87462..6ca58eb8a89 100644
--- a/test/langtools/tools/javac/importscope/T8193717.java
+++ b/test/langtools/tools/javac/importscope/T8193717.java
@@ -26,9 +26,7 @@
* @bug 8193717
* @summary Check that code with a lot named imports can compile.
* @library /tools/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox toolbox.JavapTask
diff --git a/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java b/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java
index df700552ae9..3ea1f5b72bb 100644
--- a/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java
+++ b/test/langtools/tools/javac/jvm/ClassRefDupInConstantPoolTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 8015927
* @summary Class reference duplicates in constant pool
- * @enablePreview
* @clean ClassRefDupInConstantPoolTest$Duplicates
* @run main ClassRefDupInConstantPoolTest
*/
diff --git a/test/langtools/tools/javac/lambda/ByteCodeTest.java b/test/langtools/tools/javac/lambda/ByteCodeTest.java
index df5c8df1ff9..f273305925c 100644
--- a/test/langtools/tools/javac/lambda/ByteCodeTest.java
+++ b/test/langtools/tools/javac/lambda/ByteCodeTest.java
@@ -26,8 +26,6 @@
* @bug 8011738
* @author sogoel
* @summary Code translation test for Lambda expressions, method references
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @run main ByteCodeTest
*/
diff --git a/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java b/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
index 47bc3f78f79..d4fc3eae0be 100644
--- a/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
+++ b/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
@@ -26,7 +26,6 @@
* @bug 8046060
* @summary Different results of floating point multiplication for lambda code block
* @library /tools/lib /test/lib
- * @enablePreview
* @run main LambdaTestStrictFPFlag
*/
diff --git a/test/langtools/tools/javac/lambda/LocalVariableTable.java b/test/langtools/tools/javac/lambda/LocalVariableTable.java
index e78fed1288a..cb243957287 100644
--- a/test/langtools/tools/javac/lambda/LocalVariableTable.java
+++ b/test/langtools/tools/javac/lambda/LocalVariableTable.java
@@ -25,8 +25,6 @@
* @test
* @bug 8025998 8026749 8054220 8058227
* @summary Missing LV table in lambda bodies
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g LocalVariableTable.java
* @run main LocalVariableTable
*/
diff --git a/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java b/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java
index 1220bf4dfa4..46a381c97c2 100644
--- a/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java
+++ b/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java
@@ -26,9 +26,7 @@
* @bug 8129547
* @summary Excess entries in BootstrapMethods with the same (bsm, bsmKind, bsmStaticArgs), but different dynamicArgs
* @library /tools/javac/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.jvm
* jdk.compiler/com.sun.tools.javac.tree
diff --git a/test/langtools/tools/javac/lambda/TestInvokeDynamic.java b/test/langtools/tools/javac/lambda/TestInvokeDynamic.java
index 05c304cdd31..9ad73564e23 100644
--- a/test/langtools/tools/javac/lambda/TestInvokeDynamic.java
+++ b/test/langtools/tools/javac/lambda/TestInvokeDynamic.java
@@ -28,9 +28,7 @@
* Add back-end support for invokedynamic
* temporarily workaround combo tests are causing time out in several platforms
* @library /tools/javac/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.jvm
diff --git a/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java
index 8026100772b..f7741921b70 100644
--- a/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java
+++ b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java
@@ -26,10 +26,8 @@
* @bug 8009649 8129962 8238358
* @summary Lambda back-end should generate invokevirtual for method handles referring to
* private instance methods as lambda proxy is a nestmate of the target clsas
- * @enablePreview
* @library /tools/javac/lib
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.util
* @build combo.ComboTestHelper
diff --git a/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecodeTargetRelease14.java b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecodeTargetRelease14.java
index 07a4c583807..6970832c45b 100644
--- a/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecodeTargetRelease14.java
+++ b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecodeTargetRelease14.java
@@ -26,10 +26,8 @@
* @bug 8238358
* @summary Lambda back-end should generate invokespecial for method handles referring to
* private instance methods when compiling with --release 14
- * @enablePreview
* @library /tools/javac/lib
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.util
* @build combo.ComboTestHelper
diff --git a/test/langtools/tools/javac/lambda/deduplication/DeduplicationTest.java b/test/langtools/tools/javac/lambda/deduplication/DeduplicationTest.java
index b9261632f61..10cbde8a2a4 100644
--- a/test/langtools/tools/javac/lambda/deduplication/DeduplicationTest.java
+++ b/test/langtools/tools/javac/lambda/deduplication/DeduplicationTest.java
@@ -24,9 +24,7 @@
/**
* @test 8200301 8201194
* @summary deduplicate lambda methods with the same body, target type, and captured state
- * @enablePreview
* @modules
- * java.base/jdk.internal.classfile.impl
* 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.file jdk.compiler/com.sun.tools.javac.main
@@ -66,7 +64,6 @@
import com.sun.tools.javac.tree.TreeScanner;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.JCDiagnostic;
-import jdk.internal.classfile.impl.BootstrapMethodEntryImpl;
import java.io.InputStream;
import java.nio.file.Path;
@@ -156,7 +153,7 @@ public static void main(String[] args) throws Exception {
}
BootstrapMethodsAttribute bsm = cm.findAttribute(Attributes.bootstrapMethods()).orElseThrow();
for (BootstrapMethodEntry b : bsm.bootstrapMethods()) {
- if (((BootstrapMethodEntryImpl) b).bootstrapMethod().asSymbol().methodName().equals("metafactory")) {
+ if (b.bootstrapMethod().asSymbol().methodName().equals("metafactory")) {
bootstrapMethodNames.add(
((MethodHandleEntry) b.arguments().get(1))
.reference()
diff --git a/test/langtools/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java b/test/langtools/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java
index 8052c4b67bc..7b418f6184d 100644
--- a/test/langtools/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java
+++ b/test/langtools/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java
@@ -26,9 +26,7 @@
* @bug 8067422
* @summary Check that the lambda names are not unnecessarily unstable
* @library /tools/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox toolbox.JavacTask
diff --git a/test/langtools/tools/javac/launcher/GetResourceTest.java b/test/langtools/tools/javac/launcher/GetResourceTest.java
index 4b46cb034ee..8cb9ce9fe72 100644
--- a/test/langtools/tools/javac/launcher/GetResourceTest.java
+++ b/test/langtools/tools/javac/launcher/GetResourceTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 8210009 8321739
* @summary Source Launcher classloader should support getResource and getResourceAsStream
- * @enablePreview
* @modules jdk.compiler
* @library /tools/lib
* @build toolbox.JavaTask toolbox.ToolBox
@@ -54,7 +53,6 @@ void run() throws Exception {
ToolBox tb = new ToolBox();
Path file = Paths.get(tb.testSrc).resolve("src/p/q").resolve("CLTest.java");
new JavaTask(tb)
- .vmOptions("--enable-preview", "--source", String.valueOf(Runtime.version().feature()))
.className(file.toString()) // implies source file mode
.run(Task.Expect.SUCCESS)
.writeAll();
diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
index 3045973d321..c7bc19709bf 100644
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
@@ -26,11 +26,9 @@
* @bug 8192920 8204588 8246774 8248843 8268869 8235876 8328339 8335896
* @summary Test source launcher
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.launcher
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* java.base/jdk.internal.module
* @build toolbox.JavaTask toolbox.JavacTask toolbox.TestRunner toolbox.ToolBox
* @run main SourceLauncherTest
@@ -567,7 +565,7 @@ public void testNoMain(Path base) throws IOException {
"error: can't find main(String[]) method in class: NoMain");
}
- //@Test temporary disabled as enabled preview allows no-param main
+ @Test
public void testMainBadParams(Path base) throws IOException {
tb.writeJavaFiles(base,
"class BadParams { public static void main() { } }");
@@ -575,7 +573,7 @@ public void testMainBadParams(Path base) throws IOException {
"error: can't find main(String[]) method in class: BadParams");
}
- //@Test temporary disabled as enabled preview allows non-public main
+ @Test
public void testMainNotPublic(Path base) throws IOException {
tb.writeJavaFiles(base,
"class NotPublic { static void main(String... args) { } }");
@@ -583,7 +581,7 @@ public void testMainNotPublic(Path base) throws IOException {
"error: can't find main(String[]) method in class: NotPublic");
}
- //@Test temporary disabled as enabled preview allows non-static main
+ @Test
public void testMainNotStatic(Path base) throws IOException {
tb.writeJavaFiles(base,
"class NotStatic { public void main(String... args) { } }");
diff --git a/test/langtools/tools/javac/launcher/src/p/q/CLTest.java b/test/langtools/tools/javac/launcher/src/p/q/CLTest.java
index 9f7e5577847..4ec90245659 100644
--- a/test/langtools/tools/javac/launcher/src/p/q/CLTest.java
+++ b/test/langtools/tools/javac/launcher/src/p/q/CLTest.java
@@ -30,9 +30,7 @@
* The class uses the ClassFile library to validate the contents of
* the URLs and streams returned by the methods being tested.
*
- * $ java \
- * --enable-preview
- * /path/to/CLTest.java
+ * $ java /path/to/CLTest.java
*/
package p.q;
diff --git a/test/langtools/tools/javac/linenumbers/ConditionalLineNumberTest.java b/test/langtools/tools/javac/linenumbers/ConditionalLineNumberTest.java
index c44def84987..5e1cce76a28 100644
--- a/test/langtools/tools/javac/linenumbers/ConditionalLineNumberTest.java
+++ b/test/langtools/tools/javac/linenumbers/ConditionalLineNumberTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 8034091
* @summary Add LineNumberTable attributes for conditional operator (?:) split across several lines.
- * @enablePreview
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/linenumbers/FinallyLineNumberTest.java b/test/langtools/tools/javac/linenumbers/FinallyLineNumberTest.java
index d150c6bb4b7..d1fbadb6f2f 100644
--- a/test/langtools/tools/javac/linenumbers/FinallyLineNumberTest.java
+++ b/test/langtools/tools/javac/linenumbers/FinallyLineNumberTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 8134759
* @summary Add LineNumberTable attribute for return bytecodes split around finally code
- * @enablePreview
*/
import java.lang.classfile.*;
diff --git a/test/langtools/tools/javac/linenumbers/NestedLineNumberTest.java b/test/langtools/tools/javac/linenumbers/NestedLineNumberTest.java
index 108a31c23db..8827839eb23 100644
--- a/test/langtools/tools/javac/linenumbers/NestedLineNumberTest.java
+++ b/test/langtools/tools/javac/linenumbers/NestedLineNumberTest.java
@@ -2,7 +2,6 @@
* @test /nodynamiccopyright/
* @bug 8061778
* @summary Wrong LineNumberTable for default constructors
- * @enablePreview
*/
import java.util.List;
@@ -21,8 +20,8 @@ public static void main(String[] args) throws Exception {
}
int line = lines.get(0).lineNumber();
- if (line != 50) {
- error(String.format("LineNumberTable contains wrong line number - expected %d, found %d", 50, line));
+ if (line != 49) {
+ error(String.format("LineNumberTable contains wrong line number - expected %d, found %d", 49, line));
}
}
diff --git a/test/langtools/tools/javac/linenumbers/NullCheckLineNumberTest.java b/test/langtools/tools/javac/linenumbers/NullCheckLineNumberTest.java
index d74a0e5667b..48a999c90a2 100644
--- a/test/langtools/tools/javac/linenumbers/NullCheckLineNumberTest.java
+++ b/test/langtools/tools/javac/linenumbers/NullCheckLineNumberTest.java
@@ -2,7 +2,6 @@
* @test /nodynamiccopyright/
* @bug 8172880
* @summary Wrong LineNumberTable for synthetic null checks
- * @enablePreview
*/
import java.lang.classfile.*;
@@ -36,13 +35,13 @@ public Test() {
public static void main(String[] args) throws Exception {
List<Entry> actualEntries = findEntries();
List<Entry> expectedEntries = List.of(
- new SimpleEntry<>(25, 0),
- new SimpleEntry<>(26, 4),
- new SimpleEntry<>(28, 9),
- new SimpleEntry<>(29, 16),
- new SimpleEntry<>(30, 32),
- new SimpleEntry<>(31, 46),
- new SimpleEntry<>(32, 52)
+ new SimpleEntry<>(24, 0),
+ new SimpleEntry<>(25, 4),
+ new SimpleEntry<>(27, 9),
+ new SimpleEntry<>(28, 16),
+ new SimpleEntry<>(29, 32),
+ new SimpleEntry<>(30, 46),
+ new SimpleEntry<>(31, 52)
);
if (!Objects.equals(actualEntries, expectedEntries)) {
error(String.format("Unexpected LineNumberTable: %s", actualEntries.toString()));
@@ -53,8 +52,8 @@ public static void main(String[] args) throws Exception {
} catch (NullPointerException npe) {
if (Arrays.stream(npe.getStackTrace())
.noneMatch(se -> se.getFileName().contains("NullCheckLineNumberTest") &&
- se.getLineNumber() == 30)) {
- throw new AssertionError("Should go through line 30!");
+ se.getLineNumber() == 29)) {
+ throw new AssertionError("Should go through line 29!");
}
}
}
diff --git a/test/langtools/tools/javac/meth/TestCP.java b/test/langtools/tools/javac/meth/TestCP.java
index bc574134b89..b01ac799b55 100644
--- a/test/langtools/tools/javac/meth/TestCP.java
+++ b/test/langtools/tools/javac/meth/TestCP.java
@@ -25,8 +25,6 @@
* @test
* @bug 6991980
* @summary polymorphic signature calls don't share the same CP entries
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @run main TestCP
*/
diff --git a/test/langtools/tools/javac/modules/AnnotationsOnModules.java b/test/langtools/tools/javac/modules/AnnotationsOnModules.java
index 909b5294d00..65019854360 100644
--- a/test/langtools/tools/javac/modules/AnnotationsOnModules.java
+++ b/test/langtools/tools/javac/modules/AnnotationsOnModules.java
@@ -26,10 +26,8 @@
* @bug 8159602 8170549 8171255 8171322 8254023 8341966
* @summary Test annotations on module declaration.
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
* @run main AnnotationsOnModules
*/
diff --git a/test/langtools/tools/javac/modules/IncubatingTest.java b/test/langtools/tools/javac/modules/IncubatingTest.java
index ce9d372a2f6..68f615abc04 100644
--- a/test/langtools/tools/javac/modules/IncubatingTest.java
+++ b/test/langtools/tools/javac/modules/IncubatingTest.java
@@ -26,10 +26,8 @@
* @bug 8171177 8187591
* @summary Verify that ModuleResolution attribute flags are honored.
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* java.base/jdk.internal.module
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.JavapTask ModuleTestBase
diff --git a/test/langtools/tools/javac/modules/JavaBaseTest.java b/test/langtools/tools/javac/modules/JavaBaseTest.java
index 484225fcd0c..935ddfa1d43 100644
--- a/test/langtools/tools/javac/modules/JavaBaseTest.java
+++ b/test/langtools/tools/javac/modules/JavaBaseTest.java
@@ -26,13 +26,11 @@
* @bug 8193125 8196623 8335989
* @summary test modifiers with java.base
* @library /tools/lib
- * @enablePreview
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.jvm
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.platform
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main JavaBaseTest
*/
diff --git a/test/langtools/tools/javac/modules/ModuleVersion.java b/test/langtools/tools/javac/modules/ModuleVersion.java
index cbf9b82c54c..c5368b394a1 100644
--- a/test/langtools/tools/javac/modules/ModuleVersion.java
+++ b/test/langtools/tools/javac/modules/ModuleVersion.java
@@ -25,10 +25,8 @@
* @test
* @summary simple tests of module uses
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
* @run main ModuleVersion
*/
diff --git a/test/langtools/tools/javac/modules/OpenModulesTest.java b/test/langtools/tools/javac/modules/OpenModulesTest.java
index f2bf1d00cc7..dc4c78912aa 100644
--- a/test/langtools/tools/javac/modules/OpenModulesTest.java
+++ b/test/langtools/tools/javac/modules/OpenModulesTest.java
@@ -25,10 +25,8 @@
* @test
* @summary tests for multi-module mode compilation
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
* @run main OpenModulesTest
diff --git a/test/langtools/tools/javac/multicatch/7005371/T7005371.java b/test/langtools/tools/javac/multicatch/7005371/T7005371.java
index c99371642a6..a8f71a1d078 100644
--- a/test/langtools/tools/javac/multicatch/7005371/T7005371.java
+++ b/test/langtools/tools/javac/multicatch/7005371/T7005371.java
@@ -25,8 +25,6 @@
* @test
* @bug 7005371
* @summary Multicatch: assertion error while generating LocalVariableTypeTable attribute
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g SubTest.java
* @run main T7005371
*/
diff --git a/test/langtools/tools/javac/multicatch/Pos05.java b/test/langtools/tools/javac/multicatch/Pos05.java
index 16ee54f2ccd..b3e6882752f 100644
--- a/test/langtools/tools/javac/multicatch/Pos05.java
+++ b/test/langtools/tools/javac/multicatch/Pos05.java
@@ -25,8 +25,6 @@
* @test
* @bug 6943289
* @summary Project Coin: Improved Exception Handling for Java (aka 'multicatch')
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @run main Pos05
*/
diff --git a/test/langtools/tools/javac/patterns/Annotations.java b/test/langtools/tools/javac/patterns/Annotations.java
index a8106a39827..849e104d2ba 100644
--- a/test/langtools/tools/javac/patterns/Annotations.java
+++ b/test/langtools/tools/javac/patterns/Annotations.java
@@ -26,13 +26,11 @@
* @bug 8256266 8281238
* @summary Verify annotations work correctly on binding variables
* @library /tools/javac/lib
- * @enablePreview
* @modules java.compiler
* jdk.compiler
- * java.base/jdk.internal.classfile.impl
* @build JavacTestingAbstractProcessor
* @compile Annotations.java
- * @compile -J--enable-preview -processor Annotations -proc:only Annotations.java
+ * @compile -processor Annotations -proc:only Annotations.java
* @run main Annotations
*/
diff --git a/test/langtools/tools/javac/patterns/LocalVariableTable.java b/test/langtools/tools/javac/patterns/LocalVariableTable.java
index 37051daf142..1b80743bb26 100644
--- a/test/langtools/tools/javac/patterns/LocalVariableTable.java
+++ b/test/langtools/tools/javac/patterns/LocalVariableTable.java
@@ -25,8 +25,6 @@
* @test
* @bug 8231827
* @summary Ensure the LV table entries are generated for bindings
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile -g LocalVariableTable.java
* @run main LocalVariableTable
*/
diff --git a/test/langtools/tools/javac/patterns/MatchExceptionTest.java b/test/langtools/tools/javac/patterns/MatchExceptionTest.java
index b54d0492bdf..1f761faaec1 100644
--- a/test/langtools/tools/javac/patterns/MatchExceptionTest.java
+++ b/test/langtools/tools/javac/patterns/MatchExceptionTest.java
@@ -26,10 +26,8 @@
* @bug 8297118
* @summary Verify javac uses MatchException or IncompatibleClassChangeError for exhaustive switches
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main MatchExceptionTest
*/
diff --git a/test/langtools/tools/javac/patterns/NestedPatternVariablesBytecode.java b/test/langtools/tools/javac/patterns/NestedPatternVariablesBytecode.java
index 36068729146..ddec9fd2e56 100644
--- a/test/langtools/tools/javac/patterns/NestedPatternVariablesBytecode.java
+++ b/test/langtools/tools/javac/patterns/NestedPatternVariablesBytecode.java
@@ -26,10 +26,8 @@
* @bug 8268748
* @summary Javac generates error opcodes when using nest pattern variables
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main NestedPatternVariablesBytecode
*/
diff --git a/test/langtools/tools/javac/patterns/NoUnnecessaryCast.java b/test/langtools/tools/javac/patterns/NoUnnecessaryCast.java
index 55444e1d748..84d4752671e 100644
--- a/test/langtools/tools/javac/patterns/NoUnnecessaryCast.java
+++ b/test/langtools/tools/javac/patterns/NoUnnecessaryCast.java
@@ -26,8 +26,6 @@
* @bug 8237528
* @summary Verify there are no unnecessary checkcasts and conditions generated
* for the pattern matching in instanceof.
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
* @compile NoUnnecessaryCast.java
* @run main NoUnnecessaryCast
*/
diff --git a/test/langtools/tools/javac/platform/ModuleVersionTest.java b/test/langtools/tools/javac/platform/ModuleVersionTest.java
index 0e8f8b8c05f..457674cf45c 100644
--- a/test/langtools/tools/javac/platform/ModuleVersionTest.java
+++ b/test/langtools/tools/javac/platform/ModuleVersionTest.java
@@ -26,7 +26,6 @@
* @bug 8318913
* @summary Verify correct module versions are recorded when --release is used.
* @library /tools/lib
- * @enablePreview
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/platform/VerifyCTSymClassFiles.java b/test/langtools/tools/javac/platform/VerifyCTSymClassFiles.java
index c97b15a2b15..3c563904b16 100644
--- a/test/langtools/tools/javac/platform/VerifyCTSymClassFiles.java
+++ b/test/langtools/tools/javac/platform/VerifyCTSymClassFiles.java
@@ -25,7 +25,6 @@
* @test
* @bug 8331027
* @summary Verify classfile inside ct.sym
- * @enablePreview
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
index 7f7400a65b4..97def1b1480 100644
--- a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
+++ b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
@@ -25,7 +25,6 @@
* @test
* @bug 8072480 8277106 8331027
* @summary Unit test for CreateSymbols
- * @enablePreview
* @modules java.compiler
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.jvm
@@ -102,9 +101,6 @@ void doRun() throws Exception {
null,
List.of("-d",
compileDir.toAbsolutePath().toString(),
- "--enable-preview",
- "--source",
- "" + System.getProperty("java.specification.version"),
"-g",
"--add-modules", "jdk.jdeps",
"--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
diff --git a/test/langtools/tools/javac/preview/PreviewAutoSuppress.java b/test/langtools/tools/javac/preview/PreviewAutoSuppress.java
index d77bd3b22da..20e562fe2d9 100644
--- a/test/langtools/tools/javac/preview/PreviewAutoSuppress.java
+++ b/test/langtools/tools/javac/preview/PreviewAutoSuppress.java
@@ -25,11 +25,9 @@
* @test
* @bug 8250768
* @library /tools/lib
- * @enablePreview
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main PreviewAutoSuppress
*/
diff --git a/test/langtools/tools/javac/preview/PreviewErrors.java b/test/langtools/tools/javac/preview/PreviewErrors.java
index 8c76423c9d2..3ec1e99b2ed 100644
--- a/test/langtools/tools/javac/preview/PreviewErrors.java
+++ b/test/langtools/tools/javac/preview/PreviewErrors.java
@@ -26,14 +26,12 @@
* @bug 8226585 8250768
* @summary Verify behavior w.r.t. preview feature API errors and warnings
* @library /tools/lib /tools/javac/lib
- * @enablePreview
* @modules
* java.base/jdk.internal.javac
* 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
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @build combo.ComboTestHelper
* @run main PreviewErrors
diff --git a/test/langtools/tools/javac/preview/PreviewTest.java b/test/langtools/tools/javac/preview/PreviewTest.java
index ad67ef8ac87..36f1e70acd0 100644
--- a/test/langtools/tools/javac/preview/PreviewTest.java
+++ b/test/langtools/tools/javac/preview/PreviewTest.java
@@ -25,11 +25,9 @@
* @test
* @bug 8282823 8343540
* @library /tools/lib
- * @enablePreview
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main PreviewTest
*/
diff --git a/test/langtools/tools/javac/processing/model/element/TestFileObjectOf.java b/test/langtools/tools/javac/processing/model/element/TestFileObjectOf.java
index 3fef2fe434c..15d04e39d01 100644
--- a/test/langtools/tools/javac/processing/model/element/TestFileObjectOf.java
+++ b/test/langtools/tools/javac/processing/model/element/TestFileObjectOf.java
@@ -26,10 +26,8 @@
* @bug 8224922
* @summary Verify the behavior of the Elements.getFileObjectOf
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask toolbox.TestRunner
* @build TestFileObjectOf
* @run main TestFileObjectOf
diff --git a/test/langtools/tools/javac/processing/model/element/TestOrigin.java b/test/langtools/tools/javac/processing/model/element/TestOrigin.java
index dee13cbbeb2..b12f8f2dedc 100644
--- a/test/langtools/tools/javac/processing/model/element/TestOrigin.java
+++ b/test/langtools/tools/javac/processing/model/element/TestOrigin.java
@@ -26,10 +26,8 @@
* @bug 8171355
* @summary Test behavior of javax.lang.model.util.Elements.getOrigin.
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask toolbox.TestRunner
* @build TestOrigin
* @run main TestOrigin
diff --git a/test/langtools/tools/javac/records/RecordCompilationTests.java b/test/langtools/tools/javac/records/RecordCompilationTests.java
index a01712fedb3..1de0ec48f0d 100644
--- a/test/langtools/tools/javac/records/RecordCompilationTests.java
+++ b/test/langtools/tools/javac/records/RecordCompilationTests.java
@@ -29,12 +29,10 @@
* 8332600
* @summary Negative compilation tests, and positive compilation (smoke) tests for records
* @library /lib/combo /tools/lib /tools/javac/lib
- * @enablePreview
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* @build JavacTestingAbstractProcessor
* @run junit/othervm -DuseAP=false RecordCompilationTests
* @run junit/othervm -DuseAP=true RecordCompilationTests
diff --git a/test/langtools/tools/javac/records/RecordsBinaryCompatibilityTests.java b/test/langtools/tools/javac/records/RecordsBinaryCompatibilityTests.java
index fd1304dfb9e..10ed2809bd0 100644
--- a/test/langtools/tools/javac/records/RecordsBinaryCompatibilityTests.java
+++ b/test/langtools/tools/javac/records/RecordsBinaryCompatibilityTests.java
@@ -25,12 +25,10 @@
* @test
* @summary test binary compatibility rules for record classes
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* jdk.compiler/com.sun.tools.javac.code
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main RecordsBinaryCompatibilityTests
*/
diff --git a/test/langtools/tools/javac/records/recordComponent/RecordComponentTypeTest.java b/test/langtools/tools/javac/records/recordComponent/RecordComponentTypeTest.java
index 015dc805eea..f7550cb5339 100644
--- a/test/langtools/tools/javac/records/recordComponent/RecordComponentTypeTest.java
+++ b/test/langtools/tools/javac/records/recordComponent/RecordComponentTypeTest.java
@@ -26,10 +26,8 @@
* @bug 8273408
* @summary The compiler shouldn't crash when record component uses the class generated by the annotation processor.
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @compile GenerateTypeProcessor.java
* @run main RecordComponentTypeTest
*/
diff --git a/test/langtools/tools/javac/recovery/AnnotationRecovery.java b/test/langtools/tools/javac/recovery/AnnotationRecovery.java
index d9b9854f021..1ef98901ddc 100644
--- a/test/langtools/tools/javac/recovery/AnnotationRecovery.java
+++ b/test/langtools/tools/javac/recovery/AnnotationRecovery.java
@@ -26,10 +26,8 @@
* @bug 8270139
* @summary Verify error recovery w.r.t. annotations
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main AnnotationRecovery
*/
diff --git a/test/langtools/tools/javac/recovery/AttrRecovery.java b/test/langtools/tools/javac/recovery/AttrRecovery.java
index 19325420af7..db679915e08 100644
--- a/test/langtools/tools/javac/recovery/AttrRecovery.java
+++ b/test/langtools/tools/javac/recovery/AttrRecovery.java
@@ -26,10 +26,8 @@
* @bug 8301580 8322159 8333107 8332230 8338678
* @summary Verify error recovery w.r.t. Attr
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main AttrRecovery
*/
diff --git a/test/langtools/tools/javac/recovery/FlowRecovery.java b/test/langtools/tools/javac/recovery/FlowRecovery.java
index 930f230222b..2597e7fe51e 100644
--- a/test/langtools/tools/javac/recovery/FlowRecovery.java
+++ b/test/langtools/tools/javac/recovery/FlowRecovery.java
@@ -26,10 +26,8 @@
* @bug 8331212
* @summary Verify error recovery w.r.t. Flow
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main FlowRecovery
*/
diff --git a/test/langtools/tools/javac/recovery/LambdaRecovery.java b/test/langtools/tools/javac/recovery/LambdaRecovery.java
index d64ae573ace..cbf8c540c79 100644
--- a/test/langtools/tools/javac/recovery/LambdaRecovery.java
+++ b/test/langtools/tools/javac/recovery/LambdaRecovery.java
@@ -26,10 +26,8 @@
* @bug 8297974
* @summary Verify error recovery w.r.t. lambdas
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main LambdaRecovery
*/
diff --git a/test/langtools/tools/javac/recovery/MethodModifiers.java b/test/langtools/tools/javac/recovery/MethodModifiers.java
index 893c65f8cb0..a8220114700 100644
--- a/test/langtools/tools/javac/recovery/MethodModifiers.java
+++ b/test/langtools/tools/javac/recovery/MethodModifiers.java
@@ -26,10 +26,8 @@
* @bug 8292755
* @summary Verify error recovery related to method modifiers.
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main MethodModifiers
*/
diff --git a/test/langtools/tools/javac/resolve/NoObjectToString.java b/test/langtools/tools/javac/resolve/NoObjectToString.java
index 56f574bbbbe..dd743bd7784 100644
--- a/test/langtools/tools/javac/resolve/NoObjectToString.java
+++ b/test/langtools/tools/javac/resolve/NoObjectToString.java
@@ -25,7 +25,6 @@
* @test
* @bug 8272564
* @summary Correct resolution of toString() (and other similar calls) on interfaces
- * @enablePreview
* @compile NoObjectToString.java
* @run main NoObjectToString
*/
diff --git a/test/langtools/tools/javac/sealed/BinaryCompatibilityTests.java b/test/langtools/tools/javac/sealed/BinaryCompatibilityTests.java
index 2d3ce1821d2..e505f2a291a 100644
--- a/test/langtools/tools/javac/sealed/BinaryCompatibilityTests.java
+++ b/test/langtools/tools/javac/sealed/BinaryCompatibilityTests.java
@@ -25,12 +25,10 @@
* @test
* @summary test binary compatibility rules for sealed classes
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* jdk.compiler/com.sun.tools.javac.code
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main BinaryCompatibilityTests
*/
diff --git a/test/langtools/tools/javac/sealed/CheckSubtypesOfSealedTest.java b/test/langtools/tools/javac/sealed/CheckSubtypesOfSealedTest.java
index 0f9634423ec..f0f27470aef 100644
--- a/test/langtools/tools/javac/sealed/CheckSubtypesOfSealedTest.java
+++ b/test/langtools/tools/javac/sealed/CheckSubtypesOfSealedTest.java
@@ -25,9 +25,7 @@
* @test
* @summary check subtypes of sealed classes
* @library /tools/lib /tools/javac/lib /tools/javac/classfiles/attributes/lib
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.code
+ * @modules jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
diff --git a/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java b/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
index 6cec46ef2d1..f2c40422edd 100644
--- a/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
+++ b/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
@@ -25,12 +25,10 @@
* @test 8247352 8293348
* @summary test different configurations of sealed classes, same compilation unit, diff pkg or mdl, etc
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* jdk.compiler/com.sun.tools.javac.code
- * java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask
* @run main SealedDiffConfigurationsTest
*/
diff --git a/test/langtools/tools/javac/sym/ElementStructureTest.java b/test/langtools/tools/javac/sym/ElementStructureTest.java
index 8e46863279a..7a5db50c06a 100644
--- a/test/langtools/tools/javac/sym/ElementStructureTest.java
+++ b/test/langtools/tools/javac/sym/ElementStructureTest.java
@@ -21,18 +21,16 @@
* questions.
*/
-/**
+/*
* @test
* @bug 8072480 8203814
* @summary Check the platform classpath contains the correct elements.
* @library /tools/lib
- * @enablePreview
* @modules jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.platform
* jdk.compiler/com.sun.tools.javac.util
- * java.base/jdk.internal.classfile.impl
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox ElementStructureTest
* @run main ElementStructureTest
diff --git a/test/langtools/tools/javac/varargs/6199075/T6199075.java b/test/langtools/tools/javac/varargs/6199075/T6199075.java
index 6e77280eea5..3b90295cb5e 100644
--- a/test/langtools/tools/javac/varargs/6199075/T6199075.java
+++ b/test/langtools/tools/javac/varargs/6199075/T6199075.java
@@ -28,9 +28,7 @@
* @summary Unambiguous varargs method calls flagged as ambiguous
* @author mcimadamore
*
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.util
*/
diff --git a/test/langtools/tools/javac/varargs/7042566/T7042566.java b/test/langtools/tools/javac/varargs/7042566/T7042566.java
index 18a4bb923cc..b2b37c9d573 100644
--- a/test/langtools/tools/javac/varargs/7042566/T7042566.java
+++ b/test/langtools/tools/javac/varargs/7042566/T7042566.java
@@ -26,10 +26,8 @@
* @bug 7042566 8006694 8129962
* @summary Unambiguous varargs method calls flagged as ambiguous
* temporarily workaround combo tests are causing time out in several platforms
- * @enablePreview
* @library /tools/javac/lib
- * @modules java.base/jdk.internal.classfile.impl
- * jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.util
* @build combo.ComboTestHelper
diff --git a/test/langtools/tools/javap/T6716452.java b/test/langtools/tools/javap/T6716452.java
index 20c382918c3..c2f219a4597 100644
--- a/test/langtools/tools/javap/T6716452.java
+++ b/test/langtools/tools/javap/T6716452.java
@@ -24,7 +24,6 @@
/*
* @test 6716452
* @summary need a method to get an index of an attribute
- * @enablePreview
*/
import java.io.*;
diff --git a/test/langtools/tools/javap/TestClassNameWarning.java b/test/langtools/tools/javap/TestClassNameWarning.java
index 3412f8d290f..bed3c4a2cc3 100644
--- a/test/langtools/tools/javap/TestClassNameWarning.java
+++ b/test/langtools/tools/javap/TestClassNameWarning.java
@@ -26,7 +26,6 @@
* @bug 8170708
* @summary javap -m <module> cannot read a module-info.class
* @library /tools/lib
- * @enablePreview
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javap/UndefinedAccessFlagTest.java b/test/langtools/tools/javap/UndefinedAccessFlagTest.java
index a87f33d5bdd..38a893968ca 100644
--- a/test/langtools/tools/javap/UndefinedAccessFlagTest.java
+++ b/test/langtools/tools/javap/UndefinedAccessFlagTest.java
@@ -26,7 +26,6 @@
* @summary javap should not fail if reserved access flag bits are set to 1
* @library /tools/lib
* @modules jdk.jdeps/com.sun.tools.javap
- * @enablePreview
* @run junit UndefinedAccessFlagTest
*/
diff --git a/test/langtools/tools/javap/VerificationTest.java b/test/langtools/tools/javap/VerificationTest.java
index 7caec462f16..9d9f593bc0d 100644
--- a/test/langtools/tools/javap/VerificationTest.java
+++ b/test/langtools/tools/javap/VerificationTest.java
@@ -24,7 +24,6 @@
/*
* @test
* @bug 8182774
- * @enablePreview
* @summary test on class with a verification error
* @modules jdk.jdeps/com.sun.tools.javap
*/
diff --git a/test/langtools/tools/javap/classfile/6888367/T6888367.java b/test/langtools/tools/javap/classfile/6888367/T6888367.java
index 3e3e3adcd7a..2491398a70e 100644
--- a/test/langtools/tools/javap/classfile/6888367/T6888367.java
+++ b/test/langtools/tools/javap/classfile/6888367/T6888367.java
@@ -35,8 +35,6 @@
* @test
* @bug 6888367
* @summary classfile library parses signature attributes incorrectly
- * @enablePreview
- * @modules java.base/jdk.internal.classfile.impl
*/
/*
diff --git a/test/langtools/tools/javap/classfile/T6887895.java b/test/langtools/tools/javap/classfile/T6887895.java
index fdc72395cad..b6c23a2d40e 100644
--- a/test/langtools/tools/javap/classfile/T6887895.java
+++ b/test/langtools/tools/javap/classfile/T6887895.java
@@ -25,7 +25,6 @@
* @test
* @bug 6887895
* @summary test getting constantpool elements' basename through asInternalName() API
- * @enablePreview
*/
import java.io.*;
diff --git a/test/langtools/tools/javap/classfile/deps/T6907575.java b/test/langtools/tools/javap/classfile/deps/T6907575.java
index 49019d4f870..9bcd16111d2 100644
--- a/test/langtools/tools/javap/classfile/deps/T6907575.java
+++ b/test/langtools/tools/javap/classfile/deps/T6907575.java
@@ -27,7 +27,6 @@
* @modules jdk.jdeps/com.sun.tools.jdeps
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.util
- * @enablePreview
* @build GetDeps p.C1
* @run main T6907575
*/
diff --git a/test/langtools/tools/javap/typeAnnotations/JSR175Annotations.java b/test/langtools/tools/javap/typeAnnotations/JSR175Annotations.java
index 1f5b2f43958..540d78acba8 100644
--- a/test/langtools/tools/javap/typeAnnotations/JSR175Annotations.java
+++ b/test/langtools/tools/javap/typeAnnotations/JSR175Annotations.java
@@ -30,7 +30,6 @@
* @test JSR175Annotations
* @bug 6843077
* @summary test that only type annotations are recorded as such in classfile
- * @enablePreview
*/
public class JSR175Annotations {
diff --git a/test/langtools/tools/javap/typeAnnotations/NewArray.java b/test/langtools/tools/javap/typeAnnotations/NewArray.java
index cf08baf2955..05760d6a925 100644
--- a/test/langtools/tools/javap/typeAnnotations/NewArray.java
+++ b/test/langtools/tools/javap/typeAnnotations/NewArray.java
@@ -29,7 +29,6 @@
* @test NewArray
* @bug 6843077
* @summary Test type annotations on local array are in method's code attribute.
- * @enablePreview
*/
public class NewArray {
diff --git a/test/langtools/tools/javap/typeAnnotations/Presence.java b/test/langtools/tools/javap/typeAnnotations/Presence.java
index 2fb488e705e..5e1b2a05dca 100644
--- a/test/langtools/tools/javap/typeAnnotations/Presence.java
+++ b/test/langtools/tools/javap/typeAnnotations/Presence.java
@@ -30,7 +30,6 @@
* @test Presence
* @bug 6843077
* @summary test that all type annotations are present in the classfile
- * @enablePreview
*/
public class Presence {
diff --git a/test/langtools/tools/javap/typeAnnotations/PresenceInner.java b/test/langtools/tools/javap/typeAnnotations/PresenceInner.java
index ccb79534616..d0cedc42db6 100644
--- a/test/langtools/tools/javap/typeAnnotations/PresenceInner.java
+++ b/test/langtools/tools/javap/typeAnnotations/PresenceInner.java
@@ -29,7 +29,6 @@
* @test PresenceInner
* @bug 6843077
* @summary test that annotations in inner types count only once
- * @enablePreview
*/
public class PresenceInner {
diff --git a/test/langtools/tools/javap/typeAnnotations/TypeCasts.java b/test/langtools/tools/javap/typeAnnotations/TypeCasts.java
index c8ee0fde965..8889d7e6db5 100644
--- a/test/langtools/tools/javap/typeAnnotations/TypeCasts.java
+++ b/test/langtools/tools/javap/typeAnnotations/TypeCasts.java
@@ -30,7 +30,6 @@
* @bug 6843077
* @summary test that typecasts annotation are emitted if only the cast
* expression is optimized away
- * @enablePreview
*/
public class TypeCasts {
diff --git a/test/langtools/tools/javap/typeAnnotations/Visibility.java b/test/langtools/tools/javap/typeAnnotations/Visibility.java
index ebffbf9176d..48bfbed343e 100644
--- a/test/langtools/tools/javap/typeAnnotations/Visibility.java
+++ b/test/langtools/tools/javap/typeAnnotations/Visibility.java
@@ -30,7 +30,6 @@
* @test Visibility
* @bug 6843077
* @summary test that type annotations are recorded in the classfile
- * @enablePreview
*/
public class Visibility {
diff --git a/test/langtools/tools/javap/typeAnnotations/Wildcards.java b/test/langtools/tools/javap/typeAnnotations/Wildcards.java
index 6bbabebdd37..a4e9b0609e8 100644
--- a/test/langtools/tools/javap/typeAnnotations/Wildcards.java
+++ b/test/langtools/tools/javap/typeAnnotations/Wildcards.java
@@ -29,7 +29,6 @@
* @test Wildcards
* @bug 6843077
* @summary test that annotations target wildcards get emitted to classfile
- * @enablePreview
*/
public class Wildcards {
public static void main(String[] args) throws Exception {
diff --git a/test/lib-test/jdk/test/lib/RandomGeneratorTest.java b/test/lib-test/jdk/test/lib/RandomGeneratorTest.java
index 71e36bdc9c4..2d1a30663dd 100644
--- a/test/lib-test/jdk/test/lib/RandomGeneratorTest.java
+++ b/test/lib-test/jdk/test/lib/RandomGeneratorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/lib-test/jdk/test/lib/process/ProcessToolsExecuteLimitedTestJavaTest.java b/test/lib-test/jdk/test/lib/process/ProcessToolsExecuteLimitedTestJavaTest.java
index 4331f9ab374..e500df4d112 100644
--- a/test/lib-test/jdk/test/lib/process/ProcessToolsExecuteLimitedTestJavaTest.java
+++ b/test/lib-test/jdk/test/lib/process/ProcessToolsExecuteLimitedTestJavaTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/lib-test/jdk/test/whitebox/CPUInfoTest.java b/test/lib-test/jdk/test/whitebox/CPUInfoTest.java
index 859ec772229..54a9ef872f5 100644
--- a/test/lib-test/jdk/test/whitebox/CPUInfoTest.java
+++ b/test/lib-test/jdk/test/whitebox/CPUInfoTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
index d459e4b2818..f2f744240f0 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/lib/jdk/test/lib/jfr/GCHelper.java b/test/lib/jdk/test/lib/jfr/GCHelper.java
index 6d1c424e092..07c6c1e1ce5 100644
--- a/test/lib/jdk/test/lib/jfr/GCHelper.java
+++ b/test/lib/jdk/test/lib/jfr/GCHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/lib/jdk/test/lib/process/OutputBuffer.java b/test/lib/jdk/test/lib/process/OutputBuffer.java
index f032591f358..0390535bf89 100644
--- a/test/lib/jdk/test/lib/process/OutputBuffer.java
+++ b/test/lib/jdk/test/lib/process/OutputBuffer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/lib/jdk/test/lib/thread/VThreadPinner.java b/test/lib/jdk/test/lib/thread/VThreadPinner.java
index 25b06912fdf..f77dba978ef 100644
--- a/test/lib/jdk/test/lib/thread/VThreadPinner.java
+++ b/test/lib/jdk/test/lib/thread/VThreadPinner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/lib/jdk/test/whitebox/code/Compiler.java b/test/lib/jdk/test/whitebox/code/Compiler.java
index 69d79ab9d71..b9e4da2188e 100644
--- a/test/lib/jdk/test/whitebox/code/Compiler.java
+++ b/test/lib/jdk/test/whitebox/code/Compiler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/CallerClassBench.java b/test/micro/org/openjdk/bench/java/lang/CallerClassBench.java
index 742c1c29b7a..8cdf9b767df 100644
--- a/test/micro/org/openjdk/bench/java/lang/CallerClassBench.java
+++ b/test/micro/org/openjdk/bench/java/lang/CallerClassBench.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/Characters.java b/test/micro/org/openjdk/bench/java/lang/Characters.java
index eb12ad74457..2559481fd3c 100644
--- a/test/micro/org/openjdk/bench/java/lang/Characters.java
+++ b/test/micro/org/openjdk/bench/java/lang/Characters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/MathBench.java b/test/micro/org/openjdk/bench/java/lang/MathBench.java
index fe461ee3f9c..69173d55e95 100644
--- a/test/micro/org/openjdk/bench/java/lang/MathBench.java
+++ b/test/micro/org/openjdk/bench/java/lang/MathBench.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/ObjectHashCode.java b/test/micro/org/openjdk/bench/java/lang/ObjectHashCode.java
index 3cc836cd59e..e80c0b66442 100644
--- a/test/micro/org/openjdk/bench/java/lang/ObjectHashCode.java
+++ b/test/micro/org/openjdk/bench/java/lang/ObjectHashCode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/StringFormat.java b/test/micro/org/openjdk/bench/java/lang/StringFormat.java
index 660f627e161..5b33d1195c4 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringFormat.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/StringHashCode.java b/test/micro/org/openjdk/bench/java/lang/StringHashCode.java
index 5578712f0f9..4d39bb1d8d7 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringHashCode.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringHashCode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/StringIndexOf.java b/test/micro/org/openjdk/bench/java/lang/StringIndexOf.java
index deaa7d69975..0ee7403123b 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringIndexOf.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringIndexOf.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java b/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java
index 43d94f0385a..bf66fb5220b 100644
--- a/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java
+++ b/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java
@@ -50,7 +50,7 @@
@OutputTimeUnit(TimeUnit.NANOSECONDS)
@Warmup(iterations = 3, time = 2)
@Measurement(iterations = 6, time = 1)
-@Fork(jvmArgs = "--enable-preview", value = 1)
+@Fork(value = 1)
@State(Scope.Thread)
public class TypeKindBench {
diff --git a/test/micro/org/openjdk/bench/java/lang/classfile/Utf8EntryWriteTo.java b/test/micro/org/openjdk/bench/java/lang/classfile/Utf8EntryWriteTo.java
index db27d318699..101b7e46567 100644
--- a/test/micro/org/openjdk/bench/java/lang/classfile/Utf8EntryWriteTo.java
+++ b/test/micro/org/openjdk/bench/java/lang/classfile/Utf8EntryWriteTo.java
@@ -56,7 +56,7 @@
@OutputTimeUnit(TimeUnit.NANOSECONDS)
@Warmup(iterations = 1, time = 2)
@Measurement(iterations = 3, time = 1)
-@Fork(jvmArgs = "--enable-preview", value = 3)
+@Fork(value = 3)
@State(Scope.Thread)
public class Utf8EntryWriteTo {
static final ClassDesc STRING_BUILDER = ClassDesc.ofDescriptor("Ljava/lang/StringBuilder;");
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
index 16a915af2ed..c54aa2e0724 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/CLayouts.java b/test/micro/org/openjdk/bench/java/lang/foreign/CLayouts.java
index 4028b408559..d042a86fe15 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CLayouts.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CLayouts.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadConstant.java b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadConstant.java
index 8e618da44ad..a55004bf0ed 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadConstant.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadConstant.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadHelper.java b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadHelper.java
index f0841989e76..166460857c0 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadHelper.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadVirtual.java b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadVirtual.java
index 274c11a87cf..2b3a3e89c2d 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadVirtual.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadVirtual.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java b/test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java
index 1b62d2c7264..b060365dc28 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/InternalStrLen.java b/test/micro/org/openjdk/bench/java/lang/foreign/InternalStrLen.java
index b7867efd771..4b2a5222159 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/InternalStrLen.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/InternalStrLen.java
@@ -55,10 +55,10 @@
"--enable-native-access=ALL-UNNAMED"})
public class InternalStrLen {
- private AbstractMemorySegmentImpl singleByteSegment;
- private AbstractMemorySegmentImpl singleByteSegmentMisaligned;
- private AbstractMemorySegmentImpl doubleByteSegment;
- private AbstractMemorySegmentImpl quadByteSegment;
+ private MemorySegment singleByteSegment;
+ private MemorySegment singleByteSegmentMisaligned;
+ private MemorySegment doubleByteSegment;
+ private MemorySegment quadByteSegment;
@Param({"1", "4", "16", "251", "1024"})
int size;
@@ -66,9 +66,9 @@ public class InternalStrLen {
@Setup
public void setup() {
var arena = Arena.ofAuto();
- singleByteSegment = (AbstractMemorySegmentImpl) arena.allocate((size + 1L) * Byte.BYTES);
- doubleByteSegment = (AbstractMemorySegmentImpl) arena.allocate((size + 1L) * Short.BYTES);
- quadByteSegment = (AbstractMemorySegmentImpl) arena.allocate((size + 1L) * Integer.BYTES);
+ singleByteSegment = arena.allocate((size + 1L) * Byte.BYTES);
+ doubleByteSegment = arena.allocate((size + 1L) * Short.BYTES);
+ quadByteSegment = arena.allocate((size + 1L) * Integer.BYTES);
Stream.of(singleByteSegment, doubleByteSegment, quadByteSegment)
.forEach(s -> IntStream.range(0, (int) s.byteSize() - 1)
.forEach(i -> s.set(
@@ -79,7 +79,7 @@ public void setup() {
singleByteSegment.set(ValueLayout.JAVA_BYTE, singleByteSegment.byteSize() - Byte.BYTES, (byte) 0);
doubleByteSegment.set(ValueLayout.JAVA_SHORT, doubleByteSegment.byteSize() - Short.BYTES, (short) 0);
quadByteSegment.set(ValueLayout.JAVA_INT, quadByteSegment.byteSize() - Integer.BYTES, 0);
- singleByteSegmentMisaligned = (AbstractMemorySegmentImpl) arena.allocate(singleByteSegment.byteSize() + 1).
+ singleByteSegmentMisaligned = arena.allocate(singleByteSegment.byteSize() + 1).
asSlice(1);
MemorySegment.copy(singleByteSegment, 0, singleByteSegmentMisaligned, 0, singleByteSegment.byteSize());
}
@@ -106,22 +106,22 @@ public int elementQuad() {
@Benchmark
public int chunkedSingle() {
- return StringSupport.strlenByte(singleByteSegment, 0, singleByteSegment.byteSize());
+ return StringSupport.strlenByte((AbstractMemorySegmentImpl) singleByteSegment, 0, singleByteSegment.byteSize());
}
@Benchmark
public int chunkedSingleMisaligned() {
- return StringSupport.strlenByte(singleByteSegmentMisaligned, 0, singleByteSegment.byteSize());
+ return StringSupport.strlenByte((AbstractMemorySegmentImpl) singleByteSegmentMisaligned, 0, singleByteSegment.byteSize());
}
@Benchmark
public int chunkedDouble() {
- return StringSupport.strlenShort(doubleByteSegment, 0, doubleByteSegment.byteSize());
+ return StringSupport.strlenShort((AbstractMemorySegmentImpl) doubleByteSegment, 0, doubleByteSegment.byteSize());
}
@Benchmark
public int changedElementQuad() {
- return StringSupport.strlenInt(quadByteSegment, 0, quadByteSegment.byteSize());
+ return StringSupport.strlenInt((AbstractMemorySegmentImpl) quadByteSegment, 0, quadByteSegment.byteSize());
}
// These are the legacy methods
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LinkUpcall.java b/test/micro/org/openjdk/bench/java/lang/foreign/LinkUpcall.java
index bf1d35801d2..385af2b7778 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LinkUpcall.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LinkUpcall.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverOfAddress.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverOfAddress.java
index 91f2c9e4579..2bc8b8fdc73 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverOfAddress.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverOfAddress.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java b/test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java
index 63975e47c7d..0f3564e8c95 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/QSort.java b/test/micro/org/openjdk/bench/java/lang/foreign/QSort.java
index b21e812c503..d33374baa1f 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/QSort.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/QSort.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
index 04562e0ec00..c825b8144b6 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
index 41d7deb2ebe..af4a8bdad99 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java b/test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java
index 9b6ec3fe058..f432821ef5c 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/Utils.java b/test/micro/org/openjdk/bench/java/lang/foreign/Utils.java
index 453025ed929..49d212b57e4 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/Utils.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/Utils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c b/test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c
index e7da435b43d..6f0709aff0a 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/pointers/PointerBench.java b/test/micro/org/openjdk/bench/java/lang/foreign/pointers/PointerBench.java
index b93b613f8c6..1bc7c23755b 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/pointers/PointerBench.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/pointers/PointerBench.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAccess.java b/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAccess.java
index eeedf18c771..43df5605507 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAccess.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAlloc.java b/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAlloc.java
index a210e459c21..8fac59fa9e7 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAlloc.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsAlloc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsDistance.java b/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsDistance.java
index a42b8ac0947..5e6a53bb418 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsDistance.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsDistance.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsFree.java b/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsFree.java
index bb41de670d8..d2648e7b339 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsFree.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/points/PointsFree.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/foreign/points/support/PanamaPoint.java b/test/micro/org/openjdk/bench/java/lang/foreign/points/support/PanamaPoint.java
index dca63267dc7..de7c823a917 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/points/support/PanamaPoint.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/points/support/PanamaPoint.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java b/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java
index 49a77d9539e..f70e1dd3e78 100644
--- a/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java
+++ b/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,9 +52,7 @@
@BenchmarkMode(Mode.SingleShotTime)
@OutputTimeUnit(TimeUnit.MICROSECONDS)
@State(Scope.Thread)
-@Fork(value = 10, warmups = 5, jvmArgs = {
- "--enable-preview"
-})
+@Fork(value = 10, warmups = 5)
public class LazyStaticColdStart {
private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
diff --git a/test/micro/org/openjdk/bench/java/lang/invoke/Wrappers.java b/test/micro/org/openjdk/bench/java/lang/invoke/Wrappers.java
index c1725487529..fc31c7d4b6d 100644
--- a/test/micro/org/openjdk/bench/java/lang/invoke/Wrappers.java
+++ b/test/micro/org/openjdk/bench/java/lang/invoke/Wrappers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/lang/reflect/proxy/ProxyBench.java b/test/micro/org/openjdk/bench/java/lang/reflect/proxy/ProxyBench.java
index 880f9067ae0..d20483c9faa 100644
--- a/test/micro/org/openjdk/bench/java/lang/reflect/proxy/ProxyBench.java
+++ b/test/micro/org/openjdk/bench/java/lang/reflect/proxy/ProxyBench.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/math/BigIntegerCompareTo.java b/test/micro/org/openjdk/bench/java/math/BigIntegerCompareTo.java
index e66ef1ec4d8..98ef4554ce9 100644
--- a/test/micro/org/openjdk/bench/java/math/BigIntegerCompareTo.java
+++ b/test/micro/org/openjdk/bench/java/math/BigIntegerCompareTo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/math/BigIntegerEquals.java b/test/micro/org/openjdk/bench/java/math/BigIntegerEquals.java
index 5be2471ea04..b427132e813 100644
--- a/test/micro/org/openjdk/bench/java/math/BigIntegerEquals.java
+++ b/test/micro/org/openjdk/bench/java/math/BigIntegerEquals.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/math/BigIntegerHashCode.java b/test/micro/org/openjdk/bench/java/math/BigIntegerHashCode.java
index 92ed1b88c28..f0d14c82c93 100644
--- a/test/micro/org/openjdk/bench/java/math/BigIntegerHashCode.java
+++ b/test/micro/org/openjdk/bench/java/math/BigIntegerHashCode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/math/Shared.java b/test/micro/org/openjdk/bench/java/math/Shared.java
index 2f996d052c5..1938f0d3517 100644
--- a/test/micro/org/openjdk/bench/java/math/Shared.java
+++ b/test/micro/org/openjdk/bench/java/math/Shared.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/net/NetworkInterfaceLookup.java b/test/micro/org/openjdk/bench/java/net/NetworkInterfaceLookup.java
index 4b1a5bc439a..55ac93d04ad 100644
--- a/test/micro/org/openjdk/bench/java/net/NetworkInterfaceLookup.java
+++ b/test/micro/org/openjdk/bench/java/net/NetworkInterfaceLookup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java b/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
index 704cca94af0..dedaaa59229 100644
--- a/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
+++ b/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java b/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java
index f386fb1620d..c405de0af3c 100644
--- a/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java
+++ b/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/net/ThreadLocalParseUtil.java b/test/micro/org/openjdk/bench/java/net/ThreadLocalParseUtil.java
index 180de650ede..8226ee9e839 100644
--- a/test/micro/org/openjdk/bench/java/net/ThreadLocalParseUtil.java
+++ b/test/micro/org/openjdk/bench/java/net/ThreadLocalParseUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/nio/ByteBuffers.java b/test/micro/org/openjdk/bench/java/nio/ByteBuffers.java
index 48f75a3ec81..73aa00c6c13 100644
--- a/test/micro/org/openjdk/bench/java/nio/ByteBuffers.java
+++ b/test/micro/org/openjdk/bench/java/nio/ByteBuffers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/security/MessageDigests.java b/test/micro/org/openjdk/bench/java/security/MessageDigests.java
index 2a4e3933d31..71ad7b63711 100644
--- a/test/micro/org/openjdk/bench/java/security/MessageDigests.java
+++ b/test/micro/org/openjdk/bench/java/security/MessageDigests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/security/PKCS12KeyStores.java b/test/micro/org/openjdk/bench/java/security/PKCS12KeyStores.java
index 065bd96c4bf..d5da132e5f1 100644
--- a/test/micro/org/openjdk/bench/java/security/PKCS12KeyStores.java
+++ b/test/micro/org/openjdk/bench/java/security/PKCS12KeyStores.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/security/SSLHandshake.java b/test/micro/org/openjdk/bench/java/security/SSLHandshake.java
index 62c45045585..5a4529059a5 100644
--- a/test/micro/org/openjdk/bench/java/security/SSLHandshake.java
+++ b/test/micro/org/openjdk/bench/java/security/SSLHandshake.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/security/TestCertificates.java b/test/micro/org/openjdk/bench/java/security/TestCertificates.java
index 752f0442a93..a28be021027 100644
--- a/test/micro/org/openjdk/bench/java/security/TestCertificates.java
+++ b/test/micro/org/openjdk/bench/java/security/TestCertificates.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/util/ArraysSort.java b/test/micro/org/openjdk/bench/java/util/ArraysSort.java
index d32bfa7fd2d..3a1d5f9baec 100644
--- a/test/micro/org/openjdk/bench/java/util/ArraysSort.java
+++ b/test/micro/org/openjdk/bench/java/util/ArraysSort.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/util/ListArgs.java b/test/micro/org/openjdk/bench/java/util/ListArgs.java
index d44d8b604ef..d3a01f3d603 100644
--- a/test/micro/org/openjdk/bench/java/util/ListArgs.java
+++ b/test/micro/org/openjdk/bench/java/util/ListArgs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/util/StringJoinerBenchmark.java b/test/micro/org/openjdk/bench/java/util/StringJoinerBenchmark.java
index 38b6389db54..45492d36869 100644
--- a/test/micro/org/openjdk/bench/java/util/StringJoinerBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/util/StringJoinerBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/java/util/concurrent/Maps.java b/test/micro/org/openjdk/bench/java/util/concurrent/Maps.java
index 62883efb8bb..b1c868c3f26 100644
--- a/test/micro/org/openjdk/bench/java/util/concurrent/Maps.java
+++ b/test/micro/org/openjdk/bench/java/util/concurrent/Maps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2024, Alibaba Group Holding Limited. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/FindAny.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/FindAny.java
index baf43a2e96c..6245961170a 100644
--- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/FindAny.java
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/FindAny.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/javax/crypto/AES.java b/test/micro/org/openjdk/bench/javax/crypto/AES.java
index 8bd4a6ff9b3..0bec13c5378 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/AES.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/AES.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/javax/crypto/Crypto.java b/test/micro/org/openjdk/bench/javax/crypto/Crypto.java
index 38e88d0171e..8d108e03ce2 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/Crypto.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/Crypto.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java
index 8355e4aed72..30410110ecb 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/javax/crypto/full/BenchBase.java b/test/micro/org/openjdk/bench/javax/crypto/full/BenchBase.java
index 94c8ef30ea5..38496089215 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/BenchBase.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/BenchBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/javax/crypto/full/CryptoBase.java b/test/micro/org/openjdk/bench/javax/crypto/full/CryptoBase.java
index b2d08204d7b..4b010eb5dc0 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/CryptoBase.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/CryptoBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java b/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java
index 685f73e64ce..f3c934d9c65 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@
@Fork(value = 1, jvmArgs = {
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED",
- "--enable-preview",
"--add-exports", "java.base/jdk.internal.classfile.components=ALL-UNNAMED",
"--add-exports", "java.base/jdk.internal.classfile.impl=ALL-UNNAMED"})
@State(Scope.Benchmark)
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/ClassfileBenchmark.java b/test/micro/org/openjdk/bench/jdk/classfile/ClassfileBenchmark.java
index ecd671feaac..073d87ffdf4 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/ClassfileBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/ClassfileBenchmark.java
@@ -50,9 +50,7 @@
*/
@Warmup(iterations = 3)
@Measurement(iterations = 5)
-@Fork(value = 1, jvmArgs = {
- "--enable-preview"})
-
+@Fork(value = 1)
@State(Scope.Benchmark)
public class ClassfileBenchmark {
private byte[] benchBytes;
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java b/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java
index 877a36e3864..f16535ba3ae 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java
@@ -56,7 +56,6 @@
@BenchmarkMode(Mode.Throughput)
@State(Scope.Benchmark)
@Fork(value = 1, jvmArgs = {
- "--enable-preview",
"--add-exports", "java.base/jdk.internal.classfile.impl=ALL-UNNAMED"})
@Warmup(iterations = 2)
@Measurement(iterations = 8)
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/ConstantPoolBuildingClassEntry.java b/test/micro/org/openjdk/bench/jdk/classfile/ConstantPoolBuildingClassEntry.java
index afb586dabe7..bc9d334ad35 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/ConstantPoolBuildingClassEntry.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/ConstantPoolBuildingClassEntry.java
@@ -43,7 +43,7 @@
@Measurement(iterations = 5)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@BenchmarkMode(Mode.Throughput)
-@Fork(value = 1, jvmArgs = {"--enable-preview"})
+@Fork(value = 1)
@State(Scope.Benchmark)
public class ConstantPoolBuildingClassEntry {
// JDK-8338546
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java b/test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java
index f6542983e13..9b4dae2da5b 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java
@@ -37,8 +37,7 @@
@BenchmarkMode(Mode.Throughput)
@State(Scope.Benchmark)
-@Fork(value = 1, jvmArgs = {
- "--enable-preview"})
+@Fork(value = 1)
@Warmup(iterations = 2)
@Measurement(iterations = 4)
public class RebuildMethodBodies {
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java b/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java
index f8f29036545..9c0ef02576b 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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,7 @@
@BenchmarkMode(Mode.Throughput)
@State(Scope.Benchmark)
@Fork(value = 1, jvmArgs = {
- "--add-exports", "java.base/jdk.internal.classfile.components=ALL-UNNAMED",
- "--enable-preview"})
+ "--add-exports", "java.base/jdk.internal.classfile.components=ALL-UNNAMED"})
@Warmup(iterations = 3)
@Measurement(iterations = 4)
public class RepeatedModelTraversal {
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/Write.java b/test/micro/org/openjdk/bench/jdk/classfile/Write.java
index 19dfabbdce8..ffd5b8f1c5e 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/Write.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/Write.java
@@ -59,7 +59,6 @@
@Fork(value = 1, jvmArgs = {
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED",
- "--enable-preview",
"--add-exports", "java.base/jdk.internal.classfile.impl=ALL-UNNAMED"})
public class Write {
static final int REPEATS = 40;
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java
index 8d0cce89f98..2d327958594 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/EqualsIgnoreCaseBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/EqualsIgnoreCaseBenchmark.java
index 20d7646586d..6fcf141fa9e 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/EqualsIgnoreCaseBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/EqualsIgnoreCaseBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java
index 09c467cea5b..bb7dd935f50 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskCastOperationsBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskCastOperationsBenchmark.java
index e277fd9114f..fdef723e067 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskCastOperationsBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskCastOperationsBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskFromLongBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskFromLongBenchmark.java
index ee0fadd6db8..4a00d16a2ef 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskFromLongBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskFromLongBenchmark.java
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
// 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/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskQueryOperationsBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskQueryOperationsBenchmark.java
index 20537fe74f6..c59a17fdf7f 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskQueryOperationsBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskQueryOperationsBenchmark.java
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
// 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/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java
index eb08aa38b8f..55a3c9d6b75 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java
index a85ba440dce..7159e4502db 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, Rado Smogura. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/RearrangeBytesBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/RearrangeBytesBenchmark.java
index 375ae9a0395..da8a3476199 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/RearrangeBytesBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/RearrangeBytesBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/RotateBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/RotateBenchmark.java
index 0ebf844e94b..c4cdd9681ae 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/RotateBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/RotateBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java
index 241bd081d3a..aeb63aa79f5 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadSegmentVarious.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadSegmentVarious.java
index 53564edab2d..ed6f0fc38c7 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadSegmentVarious.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadSegmentVarious.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreBytes.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreBytes.java
index feac109230a..3eb9ca63cd3 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreBytes.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreBytes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreShorts.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreShorts.java
index 842313357bd..46f314b4e66 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreShorts.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/TestLoadStoreShorts.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorFPtoIntCastOperations.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorFPtoIntCastOperations.java
index 35069af60f6..6c3f004dcd9 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorFPtoIntCastOperations.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorFPtoIntCastOperations.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/jdk/preview/patterns/Exactness.java b/test/micro/org/openjdk/bench/jdk/preview/patterns/Exactness.java
index 34971ccf93a..67697c3cd58 100644
--- a/test/micro/org/openjdk/bench/jdk/preview/patterns/Exactness.java
+++ b/test/micro/org/openjdk/bench/jdk/preview/patterns/Exactness.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/AllocationMerges.java b/test/micro/org/openjdk/bench/vm/compiler/AllocationMerges.java
index b4b833cd95a..b995f59b211 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/AllocationMerges.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/AllocationMerges.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/ClearMemory.java b/test/micro/org/openjdk/bench/vm/compiler/ClearMemory.java
index 434805875c1..df59afd0b60 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/ClearMemory.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/ClearMemory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/InterfaceCalls.java b/test/micro/org/openjdk/bench/vm/compiler/InterfaceCalls.java
index e98a3b37f55..d2108fb788a 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/InterfaceCalls.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/InterfaceCalls.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/SubIdealC0Minus_YPlusC1_.java b/test/micro/org/openjdk/bench/vm/compiler/SubIdealC0Minus_YPlusC1_.java
index 5ac4e58dce6..a9c21237023 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/SubIdealC0Minus_YPlusC1_.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/SubIdealC0Minus_YPlusC1_.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/VectorAlignment.java b/test/micro/org/openjdk/bench/vm/compiler/VectorAlignment.java
index 1d684260d89..be41882408b 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/VectorAlignment.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorAlignment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/VectorBitCount.java b/test/micro/org/openjdk/bench/vm/compiler/VectorBitCount.java
index cfb37b71caf..e5d7682ae22 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/VectorBitCount.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorBitCount.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/VectorReduction.java b/test/micro/org/openjdk/bench/vm/compiler/VectorReduction.java
index 1507dd211e6..434c315e8c5 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/VectorReduction.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorReduction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/VectorReductionFloatingMinMax.java b/test/micro/org/openjdk/bench/vm/compiler/VectorReductionFloatingMinMax.java
index 870164b8050..1e1ca06a456 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/VectorReductionFloatingMinMax.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorReductionFloatingMinMax.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
diff --git a/test/micro/org/openjdk/bench/vm/compiler/overhead/SimpleRepeatCompilation.java b/test/micro/org/openjdk/bench/vm/compiler/overhead/SimpleRepeatCompilation.java
index 9538e13df2d..e3059b90168 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/overhead/SimpleRepeatCompilation.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/overhead/SimpleRepeatCompilation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/x86/ConvertF2I.java b/test/micro/org/openjdk/bench/vm/compiler/x86/ConvertF2I.java
index dd807532e72..92460d7fb21 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/x86/ConvertF2I.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/x86/ConvertF2I.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/compiler/x86/LeaInstruction.java b/test/micro/org/openjdk/bench/vm/compiler/x86/LeaInstruction.java
index fb4be3ec454..ea7ed603b2a 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/x86/LeaInstruction.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/x86/LeaInstruction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/gc/MicroLargePages.java b/test/micro/org/openjdk/bench/vm/gc/MicroLargePages.java
index 66044f8249d..e6427a79e6e 100644
--- a/test/micro/org/openjdk/bench/vm/gc/MicroLargePages.java
+++ b/test/micro/org/openjdk/bench/vm/gc/MicroLargePages.java
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
// 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/test/micro/org/openjdk/bench/vm/lang/LockUnlock.java b/test/micro/org/openjdk/bench/vm/lang/LockUnlock.java
index 39c8569532e..de8a7f1925d 100644
--- a/test/micro/org/openjdk/bench/vm/lang/LockUnlock.java
+++ b/test/micro/org/openjdk/bench/vm/lang/LockUnlock.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* 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/test/micro/org/openjdk/bench/vm/runtime/MethodHandleStress.java b/test/micro/org/openjdk/bench/vm/runtime/MethodHandleStress.java
new file mode 100644
index 00000000000..55bb9d69f70
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/runtime/MethodHandleStress.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * 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.runtime;
+
+import java.lang.invoke.*;
+import java.lang.reflect.Constructor;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
+
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
+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.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+import org.openjdk.bench.util.InMemoryJavaCompiler;
+
+@State(Scope.Benchmark)
+@Warmup(iterations = 18, time = 5)
+@Measurement(iterations = 10, time = 5)
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Threads(1)
+@Fork(value = 2)
+public class MethodHandleStress {
+
+ // The number of distinct classes generated from the source string below
+ // All the classes are "warmed up" by invoking their methods to get compiled by the jit
+ @Param({"1000"})
+ public int classes;
+
+ // How many instances of each generated class to create and use in the measurement phase
+ @Param({"100"})
+ public int instances;
+
+ @Benchmark
+ public Integer executeOne() throws Throwable {
+ Class c = chooseClass();
+ Object r = chooseInstance(c);
+ MethodHandle m = prebindMethods.get(c).get(r);
+ assert m != null;
+ return callTheMethod(m, r);
+ }
+
+ private Map<Class, Object[]> instancesOfClassMap = new HashMap<>();
+ private Map<Class, Map<Object, MethodHandle>> prebindMethods = new ConcurrentHashMap<>();
+
+ private Class[] loadedClasses;
+
+ private class BenchLoader extends ClassLoader {
+
+ private static String classString(String name) {
+ return "public class " + name + " {"
+ + " int instA = 0;"
+ + " int getA() {"
+ + " return instA;"
+ + " }"
+ + " public Integer get(Integer depth) throws Throwable {"
+ + " return getA();"
+ + " }"
+ + "}";
+ }
+
+ private Class<?> generateClass(String name) {
+ byte[] classBytes = InMemoryJavaCompiler.compile(name, classString(name));
+ return defineClass(name, classBytes, 0, classBytes.length);
+ }
+ }
+
+ @Setup(Level.Trial)
+ public void setupClasses() throws Exception {
+ MethodHandleStress.BenchLoader loader = new MethodHandleStress.BenchLoader();
+
+ Object[] receivers1;
+
+ loadedClasses = new Class[classes];
+
+ MethodHandles.Lookup publicLookup = MethodHandles.publicLookup();
+ MethodType generatedGetType = MethodType.methodType(Integer.class, Integer.class);
+
+ for (int i = 0; i < classes; i++) {
+ Class<?> c = loader.generateClass("B" + i);
+ loadedClasses[i] = c;
+
+ Constructor<?>[] ca = c.getConstructors();
+ assert ca.length == 1;
+
+ // Build the list of prebind MHs
+ ConcurrentHashMap<Object, MethodHandle> prebinds = new ConcurrentHashMap<>();
+
+ receivers1 = new Object[instances];
+ for (int j = 0; j < instances; j++) {
+ Object inst= ca[0].newInstance();
+ receivers1[j] = inst;
+ MethodHandle mh = publicLookup.findVirtual(c, "get", generatedGetType);
+ mh = mh.bindTo(inst);
+ prebinds.put(inst, mh);
+ }
+ instancesOfClassMap.put(c, receivers1);
+ prebindMethods.put(c, prebinds);
+ }
+
+ // Warm up the methods
+ for (int n = 0; n < classes; n++) {
+ try {
+ IntStream.range(0, 5000).parallel().forEach(x -> {
+ try {
+ executeOne();
+ } catch (Throwable e) {
+ }
+ });
+ } catch (Throwable e) {
+ System.out.println("Exception = " + e);
+ e.printStackTrace();
+ System.exit(-1);
+ }
+ }
+
+ System.gc();
+ }
+
+ @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+ Class chooseClass() {
+ ThreadLocalRandom tlr = ThreadLocalRandom.current();
+ int whichClass = tlr.nextInt(classes);
+ return loadedClasses[whichClass];
+ }
+
+ @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+ Object chooseInstance(Class c) {
+ ThreadLocalRandom tlr = ThreadLocalRandom.current();
+ int whichInst = tlr.nextInt(instances);
+ return ((Object[]) instancesOfClassMap.get(c))[whichInst];
+ }
+
+ static final Integer recurse = 1;
+
+ @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+ int callTheMethod(MethodHandle m, Object r) throws Throwable {
+ return (Integer) m.invokeExact(recurse);
+ }
+}