RFR: Merge jdk21u
Jiangli Zhou
jiangli at openjdk.org
Tue Jul 30 22:53:13 UTC 2024
This PR merges with JDK 21.0.3 (https://github.com/openjdk/jdk/commit/05f18b10620834883180013bb8873a6b4bdc6df2).
Merge was done most automatically. See manual edit and change details below.
**Manual changes:**
- Edited `.jcheck/conf` and `src/hotspot/share/logging/logTag.hpp` to resolve trivial merge conflicts.
- Changed `TsanRunner `to use `ProcessTools.createLimitedTestJavaProcessBuilder()` to resolve tsan jtreg test failures. `ProcessTools.createJavaProcessBuilder()` was renamed to `ProcessTools.createLimitedTestJavaProcessBuilder` by https://github.com/openjdk/jdk/pull/15452.
**Merge commands:**
$ git remote add 21u https://github.com/openjdk/jdk21u.git
$ git remote update
$ git merge 05f18b1
#resolve merge conflicts and commit
$ git remote remove 21u
**Testing:**
$ bash configure --with-boot-jdk=/usr/local/google/home/jianglizhou/openjdk/jdk-21.0.1 --with-debug-level=release --disable-warnings-as-errors --with-jtreg=/usr/local/google/home/jianglizhou/github/jtreg/build/images/jtreg --with-stdc++lib=static --disable-precompiled-headers --enable-unlimited-crypto --with-native-debug-symbols=internal --with-default-make-target=jdk-image --disable-warnings-as-errors --with-toolchain-type=clang --disable-warnings-as-errors
$ make test TEST=hotspot/jtreg/tsan
All tests pass with `release` binary
==============================
Test summary
==============================
TEST TOTAL PASS FAIL ERROR
jtreg:test/hotspot/jtreg/tsan 79 79 0 0
==============================
TEST SUCCESS
-------------
Commit messages:
- Change TsanRunner to use ProcessTools.createLimitedTestJavaProcessBuilder(). ProcessTools.createJavaProcessBuilder() was renamed to ProcessTools.createLimitedTestJavaProcessBuilder by https://github.com/openjdk/jdk/pull/15452.
- Merge commit '05f18b1' into tsan-21-0-3-merge
- 8329838: [21u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 21.0.3
- 8319851: Improve exception logging
- 8322122: Enhance generation of addresses
- 8318340: Improve RSA key implementations
- 8315708: Enhance HTTP/2 client usage
- 8327391: Add SipHash attribution file
- 8322750: Test "api/java_awt/interactive/SystemTrayTests.html" failed because A blue ball icon is added outside of the system tray
- 8323664: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java still fails with JNI warning on some Windows configurations
- ... and 687 more: https://git.openjdk.org/tsan/compare/87a8248d...31baf134
The webrevs contain the adjustments done while merging with regards to each parent branch:
- tsan: https://webrevs.openjdk.org/?repo=tsan&pr=21&range=00.0
- jdk21u: https://webrevs.openjdk.org/?repo=tsan&pr=21&range=00.1
Changes: https://git.openjdk.org/tsan/pull/21/files
Stats: 88923 lines in 2633 files changed: 50713 ins; 21083 del; 17127 mod
Patch: https://git.openjdk.org/tsan/pull/21.diff
Fetch: git fetch https://git.openjdk.org/tsan.git pull/21/head:pull/21
PR: https://git.openjdk.org/tsan/pull/21
More information about the tsan-dev
mailing list