diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index 9d19715a9862a7aed3803170feef90cd35ba527e..acf46c615ce6e9f392bc929f8a4260a3eefcee8e 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -341,6 +341,7 @@ jobs:
run: >
if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
cat build/*/test-results/*/text/newfailures.txt ;
+ cat build/*/test-results/*/text/other_errors.txt ;
exit 1 ;
fi
@@ -807,6 +808,7 @@ jobs:
run: >
if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
cat build/*/test-results/*/text/newfailures.txt ;
+ cat build/*/test-results/*/text/other_errors.txt ;
exit 1 ;
fi
@@ -1218,6 +1220,7 @@ jobs:
run: >
if ((Get-ChildItem -Path build\*\test-results\test-summary.txt -Recurse | Select-String -Pattern "TEST SUCCESS" ).Count -eq 0) {
Get-Content -Path build\*\test-results\*\*\newfailures.txt ;
+ Get-Content -Path build\*\test-results\*\*\other_errors.txt ;
exit 1
}
@@ -1611,6 +1614,7 @@ jobs:
run: >
if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
cat build/*/test-results/*/text/newfailures.txt ;
+ cat build/*/test-results/*/text/other_errors.txt ;
exit 1 ;
fi
diff --git a/.jcheck/conf b/.jcheck/conf
index 42c3716369ea45aef1693b447d60146073e3b9bc..58d09d2b614a8f24f7802cdd4369ac85556380a9 100644
--- a/.jcheck/conf
+++ b/.jcheck/conf
@@ -1,6 +1,7 @@
[general]
project=jdk
jbs=JDK
+version=19
[checks]
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
diff --git a/doc/building.html b/doc/building.html
index 97c9b2a4bb693d81a2a523047d65fbca18088497..6b99cf03ef22b8318284507ef2ddfb42d65eacfc 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -298,7 +298,7 @@
It is advisable to keep an older version of Xcode for building the JDK when updating Xcode. This blog page has good suggestions on managing multiple Xcode versions. To use a specific version of Xcode, use xcode-select -s before running configure, or use --with-toolchain-path to point to the version of Xcode to use, e.g. configure --with-toolchain-path=/Applications/Xcode8.app/Contents/Developer/usr/bin
If you have recently (inadvertently) updated your OS and/or Xcode version, and the JDK can no longer be built, please see the section on Problems with the Build Environment, and Getting Help to find out if there are any recent, non-merged patches available for this update.
Microsoft Visual Studio
-The minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by configure and will not work. The maximum accepted version of Visual Studio is 2019.
+For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019 (16.8 or higher). For all other platforms the minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by configure and will not work. For all platforms the maximum accepted version of Visual Studio is 2022.
If you have multiple versions of Visual Studio installed, configure will by default pick the latest. You can request a specific version to be used by setting --with-toolchain-version, e.g. --with-toolchain-version=2017.
If you have Visual Studio installed but configure fails to detect it, it may be because of spaces in path.
IBM XL C/C++
diff --git a/doc/building.md b/doc/building.md
index 033f99d3f5a8bc92970864728030e6c372984b02..3ae4a28ac1f5f024da2504d217acd10531fa8cd6 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -374,9 +374,10 @@ available for this update.
### Microsoft Visual Studio
-The minimum accepted version of Visual Studio is 2017. Older versions will not
-be accepted by `configure` and will not work. The maximum accepted
-version of Visual Studio is 2019.
+For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019
+(16.8 or higher). For all other platforms the minimum accepted version of
+Visual Studio is 2017. Older versions will not be accepted by `configure` and will
+not work. For all platforms the maximum accepted version of Visual Studio is 2022.
If you have multiple versions of Visual Studio installed, `configure` will by
default pick the latest. You can request a specific version to be used by
diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index fe72cbbdf80c1cca160571c8e4b9cd51e122c9f1..5e8f0e9e174a10af5c203e2c18c8ec1610d58254 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -195,7 +195,7 @@ while ( test_foo(args...) ) { // No, excess spaces around controlSimilar discussions for some other projects:
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 6d167cad9d6c20a2c7e6713aca40994de6da9a3f..57c0c38e2b013fab3d8d0e9e0209a6ab4ad9718f 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -409,7 +409,7 @@ Similar discussions for some other projects:
* [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) —
Currently (2020) targeting C++17.
-* [C++11 and C++14 use in Chromium](https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++11.md) —
+* [C++11 and C++14 use in Chromium](https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++-features.md) —
Categorizes features as allowed, banned, or to be discussed.
* [llvm Coding Standards](https://llvm.org/docs/CodingStandards.html) —
diff --git a/doc/ide.html b/doc/ide.html
index 1730eb0bef5b5bb1e6d18aed43b61ee4155a5aaa..288a477e538f80f3c3f7c01cfcafa2e32b18b627 100644
--- a/doc/ide.html
+++ b/doc/ide.html
@@ -41,14 +41,20 @@
make vscode-project-clangd
Additional instructions for configuring the given indexer will be displayed after the workspace has been generated.
Visual Studio
-This section is a work in progress.
-make ide-project
+The make system can generate a Visual Studio project for the Hotspot native source. After configuring, the project is generated using:
+make hotspot-ide-project
+This creates a file named jvm.vcxproj in ide\hotspot-visualstudio subfolder of the build output folder. The file can be opened in Visual Studio via File -> Open -> Project/Solution.
Compilation Database
The make system can generate generic native code indexing support in the form of a Compilation Database that can be used by many different IDEs and source code indexers.
make compile-commands
It's also possible to generate the Compilation Database for the HotSpot source code only, which is a bit faster as it includes less information.
make compile-commands-hotspot
IDE support for Java code
-This section is a work in progress.
+IntelliJ IDEA
+The JDK project has a script that can be used for indexing the project with IntelliJ. After configuring and building the JDK, an IntelliJ workspace can be generated by running the following command in the top-level folder of the cloned repository:
+bash bin/idea.sh
+To use it, choose File -> Open... in IntelliJ and select the folder where you ran the above script.
+Next, configure the project SDK in IntelliJ. Open File -> Project Structure -> Project and select build/<config>/images/jdk as the SDK to use.
+In order to run the tests from the IDE, you can use the JTReg plugin. Instructions for building and using the plugin can be found here.