RFR: Merge openjdk/jdk:master

William Kemper wkemper at openjdk.org
Tue May 2 15:46:48 UTC 2023


This merges tag jdk-21+20. Please have a look at [this change](https://github.com/openjdk/shenandoah/commit/f9a114efcbfdf5b8b8d605e8b431a9312c3b6111) to resolve conflicts between `CardTable` and `ShenandoahCardTable`.

-------------

Commit messages:
 - Reduce coupling between shenandoah card table and shared card table
 - Merge tag 'jdk-21+20' into merge-jdk-21+20
 - 8305771: SA ClassWriter.java fails to skip overpass methods
 - 8306951: [BACKOUT] JDK-8305252 make_method_handle_intrinsic may call java code under a lock
 - 8306409: Open source AWT KeyBoardFocusManger, LightWeightComponent related tests
 - 8306705: com/sun/jdi/PopAndInvokeTest.java fails with NativeMethodException
 - 8302182: Update Public Suffix List to 88467c9
 - 8305853: java/text/Format/DateFormat/DateFormatRegression.java fails with "Uncaught exception thrown in test method Test4089106"
 - 8306374: (bf) Improve performance of DirectCharBuffer::append(CharSequence[,int,int])
 - 8302328: [s390x] Simplify asm_assert definition
 - ... and 197 more: https://git.openjdk.org/shenandoah/compare/b442302c...f9a114ef

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - master: https://webrevs.openjdk.org/?repo=shenandoah&pr=269&range=00.0
 - openjdk/jdk:master: https://webrevs.openjdk.org/?repo=shenandoah&pr=269&range=00.1

Changes: https://git.openjdk.org/shenandoah/pull/269/files
  Stats: 261355 lines in 2002 files changed: 237988 ins; 10398 del; 12969 mod
  Patch: https://git.openjdk.org/shenandoah/pull/269.diff
  Fetch: git fetch https://git.openjdk.org/shenandoah.git pull/269/head:pull/269

PR: https://git.openjdk.org/shenandoah/pull/269


More information about the shenandoah-dev mailing list