diff --git a/.github/actions/config/action.yml b/.github/actions/config/action.yml index 931988accc3a1..bf86a946415dd 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 79eddf8c70f0e..252105f29fddf 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 25ee1d8dfa0aa..312fb642c82b0 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 0e52320a35060..aaec9a6d19fc0 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 82022a6e233ea..4ca5d2ab8471f 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 2dda69a3f331b..65849d2e26e35 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 a612bed552779..3d54be8c5db56 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 8e97ff4439f67..3f4ba67f9968d 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 3517fa53941ea..99aaf9650a0db 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/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index 62c91ee5f78ef..7c86b77dd31ca 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 0a3039b34d221..888b8418eea87 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 52515ebd31439..69a42f166baab 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 e2704b3297568..1e54cd8af11e2 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 3e6721f994c60..86487c1c2fc19 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/Init.gmk b/make/Init.gmk index 8918de7d16e4b..f2cfe3625a520 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 55e0c150b3bb2..e1b3965ba0429 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 8ed6476c50613..13b80b8e56e52 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 ca284e21dd016..5a5e40d025a59 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 ce5d254ccc446..95ad239e846ed 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/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk index 6447da8cb6b17..03c877a427796 100644 --- a/make/RunTestsPrebuiltSpec.gmk +++ b/make/RunTestsPrebuiltSpec.gmk @@ -63,7 +63,7 @@ TEST_JOBS ?= 0 # Use hard-coded values for java flags (one size, fits all!) JAVA_FLAGS := -Duser.language=en -Duser.country=US -JAVA_FLAGS_BIG := -Xms64M -Xmx1600M +JAVA_FLAGS_BIG := -Xms64M -Xmx2048M JAVA_FLAGS_SMALL := -XX:+UseSerialGC -Xms32M -Xmx512M -XX:TieredStopAtLevel=1 BUILDJDK_JAVA_FLAGS_SMALL := -Xms32M -Xmx512M -XX:TieredStopAtLevel=1 BUILD_JAVA_FLAGS := $(JAVA_FLAGS_BIG) diff --git a/make/StaticLibsImage.gmk b/make/StaticLibsImage.gmk index 6a85701a7882c..6a181ff262f41 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 e503f1cea2c83..5c788a8d0a60a 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 df779d961fdbe..f53d851c0b75f 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 402c684119131..98287473f3ea0 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 ee33d0dfb9ef0..63ced4c75d85c 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 a476fe8a27ef1..8b6035606a5f3 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 ddb685e9bc35f..fb36ad358da3f 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/hotspot.m4 b/make/autoconf/hotspot.m4 index a95ed1fbacd2f..6dc46d17aa3eb 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-version.m4 b/make/autoconf/jdk-version.m4 index 297a6e83b5c83..52e00440795bb 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 8d0fb324cd092..3fd493c4d8e2b 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 6987250e90633..091f01cadb5d7 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 9171b7bfc2aaa..8d524c8c8b9df 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 6849b4a26c776..f1326b7ab859e 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/util_paths.m4 b/make/autoconf/util_paths.m4 index d9277b7eb9c62..7717150dfd9ea 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 4ed6c5906c786..8ba216772459f 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/Execute.gmk b/make/common/Execute.gmk index abafe77a3c46e..aa3c2e58813f9 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/MakeIO.gmk b/make/common/MakeIO.gmk index b7843817b5e7e..e1806e9259aba 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 fd6b9b4ec10ca..8ae33b3641eae 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 960c4d66c3044..d14c3ce4f765e 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 6746296df24fb..94aa259bebc53 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 928bff9bd844c..22fd6722fa235 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 75bfb0d62b181..f4df1ce3a3082 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/devkit/Makefile b/make/devkit/Makefile index 9c498807a546f..5ffa5265aa3e8 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 280224de19e7b..21d68c7b06f5e 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 718766cacaeb8..b9c2e38b820e9 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 793377ec51e95..50d04ad87afb5 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 cc4d0a174cd43..b27de609c49be 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 4dd3c898b6181..80a2df5bd5520 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 a61afa8461ad3..36dc782c8e236 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 5ceef1110864c..54c98a3eeb667 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/langtools/tools/javacserver/server/CompilerThreadPool.java b/make/langtools/tools/javacserver/server/CompilerThreadPool.java index 0a40a27ad87e7..1f9e3a195b60f 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 8d8bac76ad7b6..ac0b740a58bcc 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 cba9263567d14..ea518dc536bf8 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 8255cc62eec6a..fe417e9c423ed 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 f3509710a370e..9fa5d48009bfd 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 19d7c6dee9d42..a5bbd37321c24 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 dc1c1794e63af..4e572211334a2 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 3adf141e8e178..2eb5bd454568d 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 78847074c8819..57487c7c842f5 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 95719c7b4521b..d733af65f1ea6 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 0d25ff61e928b..0346e3832df53 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 2cae8b0fdd5cd..d19d9beb4d88d 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 b60b84cdc3cf8..2de9321392d44 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 cb9a27908ce3f..b5f1e702a7520 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 cb12bc560b2c5..41696a641a7d4 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 b1fbdcda9f4c6..cac0f770816fc 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 aa9808dd584e3..4f0ead24ece9e 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 dceae073ff385..5659423826136 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 838d37f814578..1a0177e63b039 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/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp index 6772fae50ca14..806cca16269ea 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/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp index 07c5a940a5091..17289891ccdf9 100644 --- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp @@ -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 0d28eaaf1f00f..b7fba1d76d375 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/stubRoutines_riscv.cpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp index 28b797a639e51..559511fca5713 100644 --- a/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp +++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp @@ -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/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp index 3b8d8119a8e1c..cf1f88d045c79 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp @@ -355,6 +355,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); diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp index e08838c3a6fe4..b858cca643d54 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp @@ -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/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp index af57fda23fd21..0a6d091de8c7f 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/os_cpu/linux_riscv/riscv_hwprobe.cpp b/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp index f785d93539348..b1eccb850b869 100644 --- a/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp +++ b/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp @@ -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/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp index 9c430e77d099e..7e26febda89f2 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/opto/block.cpp b/src/hotspot/share/opto/block.cpp index 857bdeb7032e9..14bc9e0797cc6 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/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp index c9d1491afc5b5..4a200241bb7f2 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 5eec8b2a8f0fa..10af40a54e649 100644 --- a/src/hotspot/share/opto/compile.cpp +++ b/src/hotspot/share/opto/compile.cpp @@ -2969,6 +2969,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); @@ -5041,7 +5044,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/gcm.cpp b/src/hotspot/share/opto/gcm.cpp index c9eb418b4f067..ebdefe597ff1f 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; jlen(); 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(); @@ -1519,6 +1532,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) { @@ -1611,8 +1627,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; } @@ -1657,6 +1673,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; + } } } @@ -1726,6 +1745,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/lcm.cpp b/src/hotspot/share/opto/lcm.cpp index 88dc00ab4637c..0079f366640e8 100644 --- a/src/hotspot/share/opto/lcm.cpp +++ b/src/hotspot/share/opto/lcm.cpp @@ -493,6 +493,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; + } } } } @@ -1362,6 +1365,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/live.cpp b/src/hotspot/share/opto/live.cpp index 7378f36df5020..7112d7aaaf0ee 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/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp index e52f31b1e118d..ca869129b24cc 100644 --- a/src/hotspot/share/opto/loopnode.cpp +++ b/src/hotspot/share/opto/loopnode.cpp @@ -4899,7 +4899,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 +6426,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 diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp index 2626b0af6ee49..2ac10bb31f0cf 100644 --- a/src/hotspot/share/opto/loopopts.cpp +++ b/src/hotspot/share/opto/loopopts.cpp @@ -1548,6 +1548,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); } @@ -1735,7 +1738,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 @@ -1983,6 +1990,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(); diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp index abfbddee21ae1..b94fb7101430e 100644 --- a/src/hotspot/share/opto/matcher.cpp +++ b/src/hotspot/share/opto/matcher.cpp @@ -1753,18 +1753,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/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index 11481954e1095..094d36d1fef2e 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -522,7 +522,6 @@ 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) }, #endif @@ -534,20 +533,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/os.hpp b/src/hotspot/share/runtime/os.hpp index db4f0f8c79076..d601acee1dca4 100644 --- a/src/hotspot/share/runtime/os.hpp +++ b/src/hotspot/share/runtime/os.hpp @@ -28,8 +28,9 @@ #include "jvm_md.h" #include "runtime/osInfo.hpp" #include "utilities/exceptions.hpp" -#include "utilities/ostream.hpp" +#include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" +#include "utilities/ostream.hpp" #ifdef __APPLE__ # include #endif @@ -1027,14 +1028,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/utilities/globalDefinitions_visCPP.hpp b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp index 5f26a082d7cb0..3f22948118df9 100644 --- a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp +++ b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp @@ -37,6 +37,7 @@ # include # include # include // for offsetof +# include # include // for stream.cpp # include // for _isnan # include // 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/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java index 3c293770003f9..7486fdd825ce5 100644 --- a/src/java.base/share/classes/module-info.java +++ b/src/java.base/share/classes/module-info.java @@ -315,8 +315,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/reflect/annotation/AnnotationParser.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java index e5a3e636c2c75..82751e3fcd293 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, 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 812e77a0a82d0..92c55f6653292 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/man/java.md b/src/java.base/share/man/java.md index f6b7fd44917a7..0beb5bf935c64 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/ub.h b/src/java.base/share/native/libjava/ub.h index cf7f491ca453e..d6e0cac3bea83 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.desktop/share/classes/java/awt/font/TextLine.java b/src/java.desktop/share/classes/java/awt/font/TextLine.java index 1e4b9c784a69c..681fcd900837a 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.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java index e5f25f8a1680b..73bb39eba985b 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/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 de289d4ffc569..efd5443607bb2 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 438ca0c92ba0f..c0972ee6db192 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 1a442761d51e4..4c80f9f7d372a 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.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 c171e10132ace..69cabd5427d41 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.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/JimageDiffGenerator.java index 5e540be7ced6a..3ef42fb9aa085 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 12e8708477c53..910fe57b75aba 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.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java b/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java index 74ed636c9d63a..ba11f16f81d8c 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/utils/hsdis/binutils/hsdis-binutils.c b/src/utils/hsdis/binutils/hsdis-binutils.c index 3e3362cac94ea..51877e85f4687 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 015a617fd8a64..d8a8719778df0 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 ecb3a40a5b54b..623df8baac010 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 ec08c9e600449..08717d459f8f6 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/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 98d7d168ba718..75f074ad09df8 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/serviceability/dcmd/framework/VMVersionTest.java b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java index 23c414dfd6e83..3e2de863eab35 100644 --- a/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java +++ b/test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java @@ -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/testlibrary/ctw/Makefile b/test/hotspot/jtreg/testlibrary/ctw/Makefile index b67500d0c5e0b..4cf20b12e52ec 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/CtwRunner.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java index e2c7230bc0dc9..72d481ac616b3 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/jdk/build/AbsPathsInImage.java b/test/jdk/build/AbsPathsInImage.java index 229094a0920e3..7821b60670a73 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/java/io/Serializable/records/BadCanonicalCtrTest.java b/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java index c9b757a7b5136..44959eaea877a 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 3a66e46f83b82..d744e9ddbade0 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 12a5fe8c40264..16266806850f3 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 34ce8f46663ee..7d5ef130c8291 100644 --- a/test/jdk/java/lang/Class/getSimpleName/GetSimpleNameTest.java +++ b/test/jdk/java/lang/Class/getSimpleName/GetSimpleNameTest.java @@ -24,7 +24,6 @@ /* @test * @bug 8057919 * @summary Class.getSimpleName() should work for non-JLS compliant class names - * @enablePreview */ import java.lang.classfile.ClassBuilder; diff --git a/test/jdk/java/lang/ModuleTests/AnnotationsTest.java b/test/jdk/java/lang/ModuleTests/AnnotationsTest.java index 1fffe710ce570..5ccdecd8734f2 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 * @build jdk.test.lib.util.ModuleInfoWriter diff --git a/test/jdk/java/lang/StackWalker/TestBCI.java b/test/jdk/java/lang/StackWalker/TestBCI.java index 4d5e6a6eaf473..0379a0199c444 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/annotation/AnnotationTypeMismatchException/AnnotationTypeMismatchTest.java b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/AnnotationTypeMismatchTest.java index 9c6bfabf82ba5..51dcf1bb91379 100644 --- a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/AnnotationTypeMismatchTest.java +++ b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/AnnotationTypeMismatchTest.java @@ -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 e8908b05ffa58..30c2c7864c6b6 100644 --- a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArityTypeMismatchTest.java +++ b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArityTypeMismatchTest.java @@ -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 15897b1ca5141..4b92ea4361c21 100644 --- a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArrayTypeMismatchTest.java +++ b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/ArrayTypeMismatchTest.java @@ -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 43e62c66e9b46..32555aefde2c7 100644 --- a/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/EnumTypeMismatchTest.java +++ b/test/jdk/java/lang/annotation/AnnotationTypeMismatchException/EnumTypeMismatchTest.java @@ -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 012f8ef2b1c7c..eab3d1ffa08c1 100644 --- a/test/jdk/java/lang/annotation/AnnotationVerifier.java +++ b/test/jdk/java/lang/annotation/AnnotationVerifier.java @@ -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/instrument/NativeMethodPrefixApp.java b/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java index 97cf4fde2f130..36f0b95d46f93 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 f3d01b17b269b..a026952b29fe1 100644 --- a/test/jdk/java/lang/instrument/RetransformApp.java +++ b/test/jdk/java/lang/instrument/RetransformApp.java @@ -37,8 +37,6 @@ * @modules java.instrument * @library /test/lib * @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 */ @@ -78,7 +76,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 896e29439e9e8..23eb2ced6f427 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/DefineClassTest.java b/test/jdk/java/lang/invoke/DefineClassTest.java index 6a9ee82de3928..9702a9f0f98a3 100644 --- a/test/jdk/java/lang/invoke/DefineClassTest.java +++ b/test/jdk/java/lang/invoke/DefineClassTest.java @@ -23,7 +23,6 @@ /* @test * @modules java.base/java.lang:open - * @enablePreview * @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 cd013f9f543a9..f5453f909e649 100644 --- a/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java +++ b/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java @@ -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 3e1f0f41d6f85..601250dcbe767 100644 --- a/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java +++ b/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java @@ -46,7 +46,6 @@ * @test * @bug 6983726 * @library /test/lib - * @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 af35d0edd03fe..faedbff07db32 100644 --- a/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java +++ b/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java @@ -25,7 +25,6 @@ * @test * @bug 8230501 * @library /test/lib - * @enablePreview * @run testng/othervm ClassDataTest */ diff --git a/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java b/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java index 4ad03bb068a89..bd72583e8bec9 100644 --- a/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java +++ b/test/jdk/java/lang/invoke/accessProtectedSuper/Test.java @@ -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/condy/BootstrapMethodJumboArgsTest.java b/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java index 1dc30a8de59f1..5178e5b866930 100644 --- a/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java +++ b/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java @@ -27,7 +27,6 @@ * @summary Test bootstrap methods throwing an exception * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 3b0d59c3a01a0..ba20b9f261973 100644 --- a/test/jdk/java/lang/invoke/condy/CondyBSMException.java +++ b/test/jdk/java/lang/invoke/condy/CondyBSMException.java @@ -27,7 +27,6 @@ * @summary Test bootstrap methods throwing an exception * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 14eb7560a7ddd..e86c6ea25f5bb 100644 --- a/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java +++ b/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java @@ -27,7 +27,6 @@ * @summary Test basic invocation of bootstrap methods * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 5cfe85d064213..16558a9772bd5 100644 --- a/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java +++ b/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java @@ -27,7 +27,6 @@ * @summary Test invalid name in name and type * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 2b2fb159e3e7b..8e9b2c6ae1ffe 100644 --- a/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java +++ b/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java @@ -27,7 +27,6 @@ * @summary Test for an interface using condy with default overpass methods * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 5f6e0dc04a27f..32d7f16ac5fe6 100644 --- a/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java +++ b/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java @@ -27,7 +27,6 @@ * @summary Test invalid name in name and type * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 2cdbff4ffdd1c..9ec2a435b98a3 100644 --- a/test/jdk/java/lang/invoke/condy/CondyNestedTest.java +++ b/test/jdk/java/lang/invoke/condy/CondyNestedTest.java @@ -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 f635bbfd59b3e..6463b5469ad82 100644 --- a/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java +++ b/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java @@ -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 057d540551602..3432ea95c4ab4 100644 --- a/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java +++ b/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java @@ -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 e488c35e77872..d02ede568770f 100644 --- a/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java +++ b/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java @@ -27,7 +27,6 @@ * @summary Test bootstrap arguments for condy * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 89db90efa144a..34f43b09de773 100644 --- a/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java +++ b/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java @@ -27,7 +27,6 @@ * @summary Test invalid name in name and type * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 766678f4686a3..4651b11b023d1 100644 --- a/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java +++ b/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java @@ -27,7 +27,6 @@ * @summary Stress test ldc to ensure HotSpot correctly manages oop maps * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 09ec64a3656f7..c2114da63f25f 100644 --- a/test/jdk/java/lang/invoke/condy/CondyWrongType.java +++ b/test/jdk/java/lang/invoke/condy/CondyWrongType.java @@ -27,7 +27,6 @@ * @summary Test bootstrap methods returning the wrong type * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 9babd3b57d686..8b94d94663b2a 100644 --- a/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java +++ b/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java @@ -27,7 +27,6 @@ * @summary Test dynamic constant bootstraps * @library /java/lang/invoke/common * @build test.java.lang.invoke.lib.InstructionHelper - * @enablePreview * @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 08138a86ed0dd..379ae765a6b80 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 @@ -79,8 +77,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 9043ce0fd851e..63ed6327c433c 100644 --- a/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java +++ b/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java @@ -24,7 +24,6 @@ /* * @test * @library /test/lib - * @enablePreview * @build HiddenNestmateTest * @run testng/othervm HiddenNestmateTest */ diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java index 656da048db931..b6fa8e9c7aa4a 100644 --- a/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java +++ b/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java @@ -26,7 +26,6 @@ * @bug 8266925 * @summary hidden class members can't be statically invocable * @modules java.base/jdk.internal.misc - * @enablePreview * @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 76d091cc51dca..a379c809b8784 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 0aa6d5425884d..97b13fea6c4bd 100644 --- a/test/jdk/java/lang/invoke/lambda/LambdaStackTrace.java +++ b/test/jdk/java/lang/invoke/lambda/LambdaStackTrace.java @@ -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 4a44a898a770b..f8c109d31f0c5 100644 --- a/test/jdk/java/lang/invoke/lookup/SpecialStatic.java +++ b/test/jdk/java/lang/invoke/lookup/SpecialStatic.java @@ -24,7 +24,6 @@ /* @test * @bug 8032400 * @summary JSR292: invokeSpecial: InternalError attempting to lookup a method - * @enablePreview * @compile -XDignore.symbol.file SpecialStatic.java * @run testng test.java.lang.invoke.lookup.SpecialStatic */ diff --git a/test/jdk/java/lang/module/ClassFileVersionsTest.java b/test/jdk/java/lang/module/ClassFileVersionsTest.java index 1ffc587865108..683ec0b0ea2d3 100644 --- a/test/jdk/java/lang/module/ClassFileVersionsTest.java +++ b/test/jdk/java/lang/module/ClassFileVersionsTest.java @@ -23,7 +23,6 @@ /** * @test - * @enablePreview * @modules java.base/jdk.internal.module * @library /test/lib * @build jdk.test.lib.util.ModuleInfoWriter diff --git a/test/jdk/java/lang/module/ConfigurationTest.java b/test/jdk/java/lang/module/ConfigurationTest.java index 2f2131b3fc228..81a2b155ea1fe 100644 --- a/test/jdk/java/lang/module/ConfigurationTest.java +++ b/test/jdk/java/lang/module/ConfigurationTest.java @@ -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 c46bb4a1e9e94..f8f7eb8a1f4c5 100644 --- a/test/jdk/java/lang/module/ModuleDescriptorTest.java +++ b/test/jdk/java/lang/module/ModuleDescriptorTest.java @@ -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 df7a17954b67b..a98645123a000 100644 --- a/test/jdk/java/lang/module/ModuleFinderTest.java +++ b/test/jdk/java/lang/module/ModuleFinderTest.java @@ -23,7 +23,6 @@ /** * @test - * @enablePreview * @modules java.base/jdk.internal.module * @library /test/lib * @build ModuleFinderTest jdk.test.lib.util.ModuleInfoWriter diff --git a/test/jdk/java/lang/module/ModuleNamesTest.java b/test/jdk/java/lang/module/ModuleNamesTest.java index 3b8b9ddcafc45..30374bf8bfbf0 100644 --- a/test/jdk/java/lang/module/ModuleNamesTest.java +++ b/test/jdk/java/lang/module/ModuleNamesTest.java @@ -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 53180174b8592..93d25cc06a375 100644 --- a/test/jdk/java/lang/module/MultiReleaseJarTest.java +++ b/test/jdk/java/lang/module/MultiReleaseJarTest.java @@ -23,7 +23,6 @@ /** * @test - * @enablePreview * @modules java.base/jdk.internal.module * @library /test/lib * @build MultiReleaseJarTest diff --git a/test/jdk/java/lang/reflect/Generics/TestMissingTypeVariable.java b/test/jdk/java/lang/reflect/Generics/TestMissingTypeVariable.java index 64f1457bdf75e..426b005a4cce8 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 2b19189ceed41..6c5e55aae183a 100644 --- a/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java +++ b/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java @@ -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 fc5f9e283640f..4888e6d506e3c 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 * @summary Class::isRecord should check that the current class is final and not abstract - * @enablePreview * @library /test/lib * @run testng/othervm IsRecordTest */ diff --git a/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java b/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java index 8c862ae729b56..6e1ef8e4c9f18 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 4d79f62a01dfb..f02b6b5f6e958 100644 --- a/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java +++ b/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java @@ -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/security/Provider/SecurityProviderModularTest.java b/test/jdk/java/security/Provider/SecurityProviderModularTest.java index 5bcf9a73301a7..b803354757ff0 100644 --- a/test/jdk/java/security/Provider/SecurityProviderModularTest.java +++ b/test/jdk/java/security/Provider/SecurityProviderModularTest.java @@ -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/time/nontestng/java/time/chrono/HijrahConfigTest.java b/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java index b76848e4bb143..6a63fc462268c 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/ServiceLoader/BadProvidersTest.java b/test/jdk/java/util/ServiceLoader/BadProvidersTest.java index 7a42854cb9e09..6a1b3a720044f 100644 --- a/test/jdk/java/util/ServiceLoader/BadProvidersTest.java +++ b/test/jdk/java/util/ServiceLoader/BadProvidersTest.java @@ -25,7 +25,6 @@ * @test * @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/javax/security/auth/login/modules/JaasModularClientTest.java b/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java index 7869c10282a23..34c08c410aa2f 100644 --- a/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java +++ b/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java @@ -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 jdk.test.lib.util.ModuleInfoWriter diff --git a/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java b/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java index d4a9e3a429738..464400c5e8a0b 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/SnippetsTest.java b/test/jdk/jdk/classfile/SnippetsTest.java index 51a73b93d678f..f6fa2281e14ee 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 flags = List.of( - "--source", String.valueOf(Runtime.version().feature())); + List 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 296312b258f43..62414b36eae48 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/VerifierSelfTest.java b/test/jdk/jdk/classfile/VerifierSelfTest.java index bc4ad5ab4ef4a..80ee89d5fda06 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/internal/reflect/CallerSensitive/CallerSensitiveFinder.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java index 2d5175dcf3fd0..65e65bf085880 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 83841fe104b13..e1790e6e17456 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 781c75b23ae9f..e8994c3c7603e 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/jfr/event/compiler/TestCompilerInlining.java b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java index b13fa71410926..2d0ce579dd810 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/io/TestInstrumentation.java b/test/jdk/jdk/jfr/event/io/TestInstrumentation.java index daa3d0162d4ce..beef8437a3442 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/javaagent/TestEventInstrumentation.java b/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java index 049a1172d0c72..d5997f1ad4666 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/startupargs/TestStartDuration.java b/test/jdk/jdk/jfr/startupargs/TestStartDuration.java index df27c054dd80e..d9697492d94fb 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 d6687af079f2c..eaae109a7fc06 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 1252b9081781d..95eadfffa4cf2 100644 --- a/test/jdk/jdk/modules/incubator/ServiceBinding.java +++ b/test/jdk/jdk/modules/incubator/ServiceBinding.java @@ -24,7 +24,6 @@ /** * @test * @bug 8233922 - * @enablePreview * @modules java.base/jdk.internal.module * @library /test/lib * @build ServiceBinding TestBootLayer jdk.test.lib.util.ModuleInfoWriter diff --git a/test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java b/test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java index 06b5ed082f515..3655c01b5b0b9 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/tools/jcmd/TestProcessHelper.java b/test/jdk/sun/tools/jcmd/TestProcessHelper.java index 73f04563cc9fb..9d9b34dad4112 100644 --- a/test/jdk/sun/tools/jcmd/TestProcessHelper.java +++ b/test/jdk/sun/tools/jcmd/TestProcessHelper.java @@ -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/tools/jimage/JImageNonAsciiNameTest.java b/test/jdk/tools/jimage/JImageNonAsciiNameTest.java index c50a10539fc2e..e5a961bf366d4 100644 --- a/test/jdk/tools/jimage/JImageNonAsciiNameTest.java +++ b/test/jdk/tools/jimage/JImageNonAsciiNameTest.java @@ -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 3342c56602594..d36b727d87222 100644 --- a/test/jdk/tools/jimage/JImageTest.java +++ b/test/jdk/tools/jimage/JImageTest.java @@ -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 3177b37666a72..65d2b684313ca 100644 --- a/test/jdk/tools/jlink/DefaultProviderTest.java +++ b/test/jdk/tools/jlink/DefaultProviderTest.java @@ -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 69a564c7538ab..c3b992adafaa3 100644 --- a/test/jdk/tools/jlink/ExplodedModuleNameTest.java +++ b/test/jdk/tools/jlink/ExplodedModuleNameTest.java @@ -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/IntegrationTest.java b/test/jdk/tools/jlink/IntegrationTest.java index ea48e9bdfd292..a8e81005f9e0f 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 bb4f18cb4e878..6aa3007ed4541 100644 --- a/test/jdk/tools/jlink/JLink100Modules.java +++ b/test/jdk/tools/jlink/JLink100Modules.java @@ -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 1e0fe69348982..f00def47b178f 100644 --- a/test/jdk/tools/jlink/JLink2Test.java +++ b/test/jdk/tools/jlink/JLink2Test.java @@ -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 c7af8865a793b..fbdbc6e3ba4ea 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 6f88c02b0c8a1..bf7798ffa3a4e 100644 --- a/test/jdk/tools/jlink/JLinkNegativeTest.java +++ b/test/jdk/tools/jlink/JLinkNegativeTest.java @@ -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 95b4268069d96..892a3891d77af 100644 --- a/test/jdk/tools/jlink/JLinkOptionsTest.java +++ b/test/jdk/tools/jlink/JLinkOptionsTest.java @@ -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 cd524db747a08..f8d78475f8f71 100644 --- a/test/jdk/tools/jlink/JLinkPluginsTest.java +++ b/test/jdk/tools/jlink/JLinkPluginsTest.java @@ -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 e897badad133c..63863812e2a6e 100644 --- a/test/jdk/tools/jlink/JLinkTest.java +++ b/test/jdk/tools/jlink/JLinkTest.java @@ -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 d8fda1387d7fa..bd71fcce10836 100644 --- a/test/jdk/tools/jlink/ModuleNamesOrderTest.java +++ b/test/jdk/tools/jlink/ModuleNamesOrderTest.java @@ -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 8fba7b8f699ec..1c117476433b7 100644 --- a/test/jdk/tools/jlink/NativeTest.java +++ b/test/jdk/tools/jlink/NativeTest.java @@ -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 acb2e65fd382f..a931662887fd8 100644 --- a/test/jdk/tools/jlink/plugins/AddOptionsPluginTest.java +++ b/test/jdk/tools/jlink/plugins/AddOptionsPluginTest.java @@ -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 c9766183297bf..466836253209f 100644 --- a/test/jdk/tools/jlink/plugins/CDSPluginTest.java +++ b/test/jdk/tools/jlink/plugins/CDSPluginTest.java @@ -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/GenerateJLIClassesPluginTest.java b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java index 1acad93f5d357..998444b9a7719 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 e2dd3403c83f5..f0fe3149247ea 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 207290d6cf71f..40b3059719213 100644 --- a/test/jdk/tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java +++ b/test/jdk/tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java @@ -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 3979c7e833bab..d1c765c7c9d11 100644 --- a/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java +++ b/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java @@ -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 0bcb19e087caf..da2670250bbe3 100644 --- a/test/jdk/tools/jlink/plugins/StripJavaDebugAttributesPluginTest.java +++ b/test/jdk/tools/jlink/plugins/StripJavaDebugAttributesPluginTest.java @@ -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 2f2c52a6c1783..3cffac891867d 100644 --- a/test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java +++ b/test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java @@ -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/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java index 54faadcee1e8c..422b0fcddc81d 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: C.InnerC.
+ Unqualified Link1: C.InnerC.
+ Unqualified Link2: C.InnerC.
+ Qualified Link: C.method(pkg.\ + C.InnerC, pkg.C.InnerC2).
+ Unqualified Link: C.method(C.InnerC, C.InnerC2).
+ Unqualified Link: C.method(InnerC, InnerC2).
+ Link w/o Signature: C.method(C.InnerC, C.InnerC2).
+ Package Link: pkg.
"""); checkOutput("pkg/C.html", true, """ Qualified Link: C.InnerC.
@@ -59,6 +70,7 @@ public void test() { C.InnerC, pkg.C.InnerC2).
Unqualified Link: method(C.InnerC, C.InnerC2).
Unqualified Link: method(InnerC, InnerC2).
+ Link w/o Signature: method(C.InnerC, C.InnerC2).
Package Link: pkg.
"""); 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 3adfe661965eb..86d678fbaa512 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 { m1 package link Lib - Lib.method(java.lang.String) + Lib.method(String) Lib.method(String) m2 m2 @@ -110,7 +110,7 @@ public void testLinkModuleExternal(Path base) throws Exception { Lib Lib.method(java.lang.String) + interface in com.m1.lib" class="external-link">Lib.method(String) Lib.method(String) m2 diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/pkg/C.java index 97b3f402235bf..16e788595ff4a 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)}.
* Unqualified Link: {@link #method(C.InnerC, C.InnerC2)}.
* Unqualified Link: {@link #method(InnerC, InnerC2)}.
+ * Link w/o Signature: {@link #method}.
* Package Link: {@link pkg}.
* * diff --git a/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java b/test/langtools/jdk/javadoc/doclet/testNestedGenerics/TestNestedGenerics.java index b34574a592dfe..ce5ec77a5736c 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, """ -
Contains foo(java.util.Ma\ - p<A, java.util.Map<A, A>>)
"""); +
Contains foo(Map)
"""); } } diff --git a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java index 6864aca195956..810db37839443 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 {
  • m1
  • com.m1.lib
  • Lib
    • -
  • Lib.method(java.lang.String)
    • +
  • Lib.method(String)
  • Lib.method(String)
  • m2
  • m2
  • com.m2.lib
  • Lib
    • -
  • Lib.method(java.lang.String)
    • +
  • Lib.method(String)
  • Lib.method(String)
    • """); } @@ -115,7 +115,7 @@ public void testSeeModuleExternal(Path base) throws Exception {
  • m1/com.m1.lib
  • Lib
  • Lib.method(java.lang.String)
    • + interface in com.m1.lib" class="external-link">Lib.method(String)
  • Lib.method(String)
  • m2
    • @@ -123,7 +123,7 @@ interface in com.m1.lib" class="external-link">Lib.method(String)m2/com.m2.lib
  • Lib
  • Lib.method(java.lang.String)
    • + interface in com.m2.lib" class="external-link">Lib.method(String)
  • Lib.method(String)
    • """); diff --git a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java index f188aa036f43f..ee5014a310a0d 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 9989ff83454ab..de832aef70612 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 c5c12259c14ad..3aafbf74b6ac9 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 cff6e774a2f3d..1fd3fb3fbcc85 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 734b174168278..66cd9e91ff2ff 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 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 eee423e48a86e..99ad19203b580 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 de8cdbc5af3a9..4ba8c7a6491f9 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 8f2ed91039cfd..8b8eb23be4d65 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 fb78132e4f104..e163a4350cd3b 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 e30f83f8af35d..c373de15e52cf 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 3926d9623a3c8..d0bf322b0c63e 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 3e2d151808f2f..5a2f3dfd37749 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. *

    diff --git a/test/langtools/tools/javac/MethodParameters/Constructors.java b/test/langtools/tools/javac/MethodParameters/Constructors.java index a797b40db5e81..27c146ad04966 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 0f706e7e02d49..f7570644ecd76 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 e84f12245c777..c3d45270c8ef4 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 252c9487ce4cb..cad796a12fd8c 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 dad79da509e67..b2e0c6eac702d 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 061e2213a4c48..554ed7983160b 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 940d30da40c9a..b0ea9c9fbeeb7 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 a6c0d8aa5d09a..24cadb6ca36ca 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 ae17d90150d85..f531db7a09a5d 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 a4d55525e60c5..8636d8bfc613c 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 64e68aad1de52..ed787c759f46d 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 0eb4d1b8a42ae..b53238ce4e57e 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 8ec49a17c4d3a..f4fed6fe68b96 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 174e9721f3fec..2d3d25dde5eba 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 470182bc04e38..8c20117a75676 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 c4aa54618ea70..d9d7332e876dd 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 bb486b3238263..b842f1a54ff55 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 56813905ca563..070d45d2be35d 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 839c835c8007c..62bae68ad3603 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 2aaf5d40f39af..4353a119ec7ab 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 0a8fac0692b01..0b527794c1a41 100644 --- a/test/langtools/tools/javac/T7093325.java +++ b/test/langtools/tools/javac/T7093325.java @@ -27,9 +27,7 @@ * @summary Redundant entry in bytecode exception table * 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.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 d7b823d94ec2f..493dbab113d7f 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 2f10e510b0ceb..ee170ec939e82 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 81879a5f2a056..a72c768aaef6a 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 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 2957bdd20e736..4f32bc090c366 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 4ddc40fa231a2..c916089f4ed9c 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 8dd87820423ac..1870cc4cfa136 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 36afea59094fb..df6c32dcd48b6 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 150b0fc8c7cbc..759b78cb929ea 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 1a095ab5301e6..ad33759899fbc 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 1cd9ee211e0e1..1da6fa5e12132 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 aebc8a570d5f6..bf20746c73828 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 f123399c8f53d..44e6564e49ff1 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 e18761fe5d143..e506340ab0a99 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 35ccb627b4402..225b105664ec5 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 d6f728eda5a3b..007e7648d4077 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 4c1e3a4827518..1f2230493e445 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 0bc65af8aa165..75e8d57fdad9f 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 b26232c4989d5..692499a0b8abb 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 395765fcb8044..da042001356f6 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/TypeAnnotationsPositionsOnRecords.java b/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java index 6d2aabaee80c6..190c6372ebc9c 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 7384f4bd5d733..199e56fbf5319 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 eb4b5aa2cf717..7a11e5239d127 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 dfe116580b529..7d3f42584ad82 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 46f5717103a9e..dda964c347393 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 d0a4deef80b89..16e2ed0bb5cc7 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 02caa8df61503..3a9fdc9270a10 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 be3ca03c30c7e..d6a775c2b6c70 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 f447dde8998a5..cbaebb4916ecb 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 ffab642c1d59c..65d5a639f3508 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 35bc576a2caa0..4025a61be6af3 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 8034154478915..b44faa4d6cf05 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 4b8d317d771f6..cc2dcf8277fef 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 5dae330b193fd..4dbff9cd68f8f 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 fc9ffdfef1da2..0aa41def87584 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 635f4ce9fb264..045c75fa39f94 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 fc232d06b6457..efb78c02ad3c6 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 048c1836664ab..ea4f69ecaca90 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 9f7873bb2c0b7..46f9ba18e9b36 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 04907df12039c..9a0ed02ae2891 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 31d9294f12032..3295d0a513bca 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 8607b1cc312bd..c4581fc1bf351 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 696d3b3292971..2202766e45057 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 bcffb424827e9..f89ec2efce463 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 beab5ea9fb532..89128a6088873 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 b479f7dcfdc15..e179764a1e8fc 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 7a77ac2390b36..089f32ae775bc 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 b52a20353d874..b89517c437607 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 706edb453b13f..70af95919000a 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 690f0ddc1867b..1d78183e68eb6 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 f0df24e38056e..38026251a192b 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 2f5b6d43636d2..edc9ae18a3255 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 faae9c91c04b5..d379301005f38 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 ee7248db119f3..b174ea414c41c 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 546b8cdeb0a23..69de815909ec3 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 fa6203e3fffe2..05a8c09c1cfa6 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 a3d927a0fb93a..a1883ff486475 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 f3b54ff35a1db..37aedf75f623e 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 cac938a4869e5..ff90b8bb2dacc 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 70cb3a94bd8d3..1d78cfed508d4 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 e1be3ea1435ce..bb5944d400c85 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 9afaffe0bf1a6..612601538b60f 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 5cbb6a370fa0e..e82c5f4009ab2 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 544314832e8de..0bf600044b1f3 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 eca1b840b3a81..db06862d3aeb6 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 231a132e5795f..b165967bf5e93 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 2911e58820f1c..f67fa87474edc 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 924916f5cbdf9..69a40ddbf45c5 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 8312b535f50f9..3d3d4f69d0a01 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 53a60b69cb032..b2b3e1e8a2c7f 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 58f1386a0006b..a1bb8a6150c79 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 e22a847370b2e..e445818553eaf 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 934a0ef09e76a..5c8af7e3a710e 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 07a1e7c757565..d17ae2387045d 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 1139b8d2fdefc..2ce77364bea8a 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 6681231e4b254..0f4ed838edd85 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 a0e88b7c602b7..2dcee4d16e195 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 c6a329b7d0b39..cf09ce7ca3907 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 ae6b5f740c437..20012318ea77f 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 661b340573539..b7e6d2ca99ae0 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 d15efea17dff0..54706e2822b1f 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 e5a7dfa480ea7..795a4d30bea8e 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 ae3670aca034a..740607d56c06a 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 3444cc14ce7d8..6966ed1852c07 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 51e668779b608..2131b5a4f02e0 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 e805baca82a8e..cce155bbb71ea 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 63eb7369ff023..15696c89beecb 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 e2442f421d884..d8cd067408f3e 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 a5b44936edea3..dc45a92d407b0 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 1c7aae4ae0ffb..d2079bb13f9b1 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 886ee032ed29b..d0b65e41cfe6f 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 d4a4972f135da..4e4b2faacd270 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 33f55545d819f..07885640f8ae7 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 d29d2ef96008d..ee85b2dc650ff 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 1c220441d8da4..3072b641b6957 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 3eef2e12ba780..0440ec1a4305e 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 94f4af3a1e27d..720af8507a87e 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 8015177ff1407..508bf245c47c6 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 fedcf817ee345..96c7a41fea981 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 e4dfb5000f585..db123295f7c09 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 10d93dd763109..5d26990d23d87 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 891f09ae083db..d4cfbbe8d1962 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 108a9a1645081..18a3c966546f0 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 ed87191d9c0e1..7c07628afbddc 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 04bf7820b12fc..7691bc54ba744 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 ac8069b2a76a5..c0ca6d2426dc6 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 2ad55bea369cf..8fc1aadb2760c 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 c4ee74e8ee342..f699124dca996 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 5d3bcc519ff8d..553155fa9f280 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 948b8abfcecaf..6a80acd406e21 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 2846325dd4a88..6e0671c2b236b 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 ef9bd07cd6942..c40ac214bd787 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 a62c3a1d98917..9443ccc51517b 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 b3e7339b24087..d2b8c56207f83 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 6467f3d8027c9..9a83cb2a9201d 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 a07a111f024ed..a7d84a4a59918 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 f02da8d302a64..cdf2413eeeca8 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 06ccbdf07252e..1b78cbeccece5 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 7fd6c7bd2590d..c40b7161d6d0b 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 124f46acded94..a6210b8455a90 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 45554408974de..fb6003752f623 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 9b7be560ed4da..f69b0d1a885cc 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 df638c9cd9106..bd5d27e73079d 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 9ff973177ab34..7bca5b5240f4c 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 722c1f4951abb..3e6d32044cb21 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 bf5488f60b5c3..a2409c810d169 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 96f2efc6ea6e4..d8b786221859c 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 f2901d4c9cbec..6225c89e591df 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 41d9627b278f1..43aa1462ca623 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 3136cce327d59..3c4775d22a797 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 59d86c3f65af0..01beace40ca19 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 aeee14b8e90a7..413bee58f001c 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 57f48bd6d3cc7..ca25c1028f6ac 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 522d607760249..c0dac827f814b 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 53136291cfaa5..5e6051ddd7546 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 6f3ea9da4ed5f..abf8e5987d715 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 35d65208bc5df..e6f29a1d078c4 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 a44adbf6d9e71..1523ac59f37c7 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 cddd3f2495630..56b93183abea4 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 8b5e4e7b695dd..3a8be1f53ed33 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 44e2744b74e5b..d96fb60a1b711 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 59a6e4daa24d8..c487ccea269ca 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 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 589b65bcf66e5..ed952ea3799f1 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 fd321f3a269c2..398a2eca16987 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 ec4e8b7b558b7..edf8427bc9362 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 5d334224dc7ce..cff1b10a7e533 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 8be378eaf7b2a..9aa52686bc470 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 65d4ed24cb320..b5f5b2031dead 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 1c76e429fd657..8940032367d80 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 keys, boolean raw, boolean verbose if (procFiles.size() > 0) { List 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 c8dac3a388dce..1a9faf6754739 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 c61e123c64758..bae237b09d21d 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 264b8861107a2..ba739de15eca0 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 e48793020588f..57f4fcde3e761 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 eba933af49e6c..9cb544244f237 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 28f25f8b5bf98..cb2d4ba058e97 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 45405aac2ee1a..ea5295505e1d8 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 cd4374d93e2b7..3686323567b37 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 acf1a3cdef1cf..25414c8127c62 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 bb2f0e8746226..6ca58eb8a89f3 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 df700552ae940..3ea1f5b72bb1e 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 df5c8df1ff9aa..f273305925c61 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 47bc3f78f793c..d4fc3eae0be47 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 e78fed1288aab..cb243957287c1 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 1220bf4dfa415..46a381c97c279 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 05c304cdd31c0..9ad73564e2327 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 c19c848ee6845..f7741921b7000 100644 --- a/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java +++ b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java @@ -27,9 +27,7 @@ * @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 * @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.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 326de3168b39a..6970832c45bb2 100644 --- a/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecodeTargetRelease14.java +++ b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecodeTargetRelease14.java @@ -27,9 +27,7 @@ * @summary Lambda back-end should generate invokespecial for method handles referring to * private instance methods when compiling with --release 14 * @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.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 b9261632f618e..10cbde8a2a4a7 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 8052c4b67bc72..7b418f6184d8a 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 4b46cb034eeed..8cb9ce9fe72a1 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 090c4e298fd1d..3676ced9535b5 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 @@ -566,7 +564,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() { } }"); @@ -574,7 +572,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) { } }"); @@ -582,7 +580,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 9f7e557784726..4ec90245659cb 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 c44def8498775..5e1cce76a28b2 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 d150c6bb4b7f3..d1fbadb6f2ffa 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 108a31c23db02..8827839eb2313 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 d74a0e5667b1f..48a999c90a261 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 actualEntries = findEntries(); List 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 bc574134b89f8..b01ac799b556f 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 909b5294d00d2..65019854360d0 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 ce9d372a2f669..68f615abc04fd 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 484225fcd0c1f..935ddfa1d437f 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 cbf9b82c54cd8..c5368b394a19e 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 f2bf1d00cc760..dc4c78912aa80 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 c99371642a624..a8f71a1d07867 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 16ee54f2ccd23..b3e6882752f41 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 a8106a39827ed..849e104d2bac8 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 37051daf14213..1b80743bb2643 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 b54d0492bdf4f..1f761faaec15a 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 36068729146b2..ddec9fd2e563b 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 55444e1d7482e..84d4752671ec2 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 0e8f8b8c05f0b..457674cf45c2f 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 c97b15a2b15fe..3c563904b16df 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 7f7400a65b475..97def1b148003 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 d77bd3b22dab0..20e562fe2d927 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 8c76423c9d248..3ec1e99b2ed9d 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 ad67ef8ac87c3..36f1e70acd07d 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 3fef2fe434c25..15d04e39d019e 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 dee13cbbeb2e4..b12f8f2dedc94 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 a01712fedb37e..1de0ec48f0dbd 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 fd1304dfb9e7d..10ed2809bd038 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 015dc805eeadc..f7550cb533995 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 d9b9854f021f9..1ef98901ddcdd 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 19325420af7f9..db679915e08b2 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 930f230222b37..2597e7fe51e0a 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 d64ae573aced3..cbf8c540c790c 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 893c65f8cb04c..a822011470003 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 56f574bbbbe93..dd743bd7784d5 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 2d3ce1821d2c5..e505f2a291a66 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 0f9634423ec1b..f0f27470aefa6 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 6cec46ef2d14b..f2c40422edd25 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 8e46863279a24..7a5db50c06a33 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 6e77280eea50b..3b90295cb5ee6 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 41c8e9609cacd..b2b37c9d573d7 100644 --- a/test/langtools/tools/javac/varargs/7042566/T7042566.java +++ b/test/langtools/tools/javac/varargs/7042566/T7042566.java @@ -27,9 +27,7 @@ * @summary Unambiguous varargs method calls flagged as ambiguous * 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.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 20c382918c3a0..c2f219a459748 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 3412f8d290f49..bed3c4a2cc3e9 100644 --- a/test/langtools/tools/javap/TestClassNameWarning.java +++ b/test/langtools/tools/javap/TestClassNameWarning.java @@ -26,7 +26,6 @@ * @bug 8170708 * @summary javap -m 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 822c9e20f3533..ab63dbddce8c6 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 7caec462f165d..9d9f593bc0d92 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 3e3e3adcd7a67..2491398a70eec 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 fdc72395cad13..b6c23a2d40e9b 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 49019d4f870ce..9bcd16111d2fe 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 1f5b2f43958d4..540d78acba80e 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 cf08baf29550d..05760d6a92510 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 2fb488e705e96..5e1b2a05dca78 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 ccb795346166c..d0cedc42db6cd 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 c8ee0fde965b2..8889d7e6db509 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 ebffbf9176dcc..48bfbed343e87 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 6bbabebdd372e..a4e9b0609e860 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/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java b/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java index 43d94f0385a32..bf66fb5220be5 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 db27d3186993a..101b7e4656773 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/invoke/LazyStaticColdStart.java b/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java index 49a77d9539ef4..a28e8c8287663 100644 --- a/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java +++ b/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java @@ -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/jdk/classfile/AbstractCorpusBenchmark.java b/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java index 685f73e64ce8f..51ee5743f9bf7 100644 --- a/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java +++ b/test/micro/org/openjdk/bench/jdk/classfile/AbstractCorpusBenchmark.java @@ -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 ecd671feaac37..073d87ffdf448 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 877a36e3864c1..f16535ba3aea0 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 afb586dabe7d9..bc9d334ad35d5 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 f6542983e134a..9b4dae2da5b09 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 f8f290365454c..e96e322c59d54 100644 --- a/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java +++ b/test/micro/org/openjdk/bench/jdk/classfile/RepeatedModelTraversal.java @@ -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 19dfabbdce8f6..ffd5b8f1c5ed5 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/vm/runtime/MethodHandleStress.java b/test/micro/org/openjdk/bench/vm/runtime/MethodHandleStress.java new file mode 100644 index 0000000000000..55bb9d69f70b8 --- /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 instancesOfClassMap = new HashMap<>(); + private Map> 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 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); + } +}