RFR: Merge lworld
Vicente Romero
vromero at openjdk.org
Fri Nov 1 22:01:41 UTC 2024
Merge branch 'lworld' into lw5_merge_lworld
# Conflicts:
# src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
# src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
# src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
# src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
# src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
# src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
# src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
# src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
# test/langtools/tools/javac/diags/examples.not-yet.txt
-------------
Commit messages:
- Merge branch 'lworld' into lw5_merge_lworld
- [lworld] Adjust testing after merging jdk-24+18
- Merge jdk
- 8341148: Open source several Choice related tests
- 8334060: Implementation of Late Barrier Expansion for G1
- 8341091: CDS: Segmented roots array misses roots
- 8341239: Open source closed frame tests # 3
- 8341191: Open source few more AWT FileDialog tests
- 8341177: Opensource few List and a Window test
- 8309841: Jarsigner should print a warning if an entry is removed
- ... and 1529 more: https://git.openjdk.org/valhalla/compare/ff277645...4a7d52c6
The webrevs contain the adjustments done while merging with regards to each parent branch:
- lw5: https://webrevs.openjdk.org/?repo=valhalla&pr=1295&range=00.0
- lworld: https://webrevs.openjdk.org/?repo=valhalla&pr=1295&range=00.1
Changes: https://git.openjdk.org/valhalla/pull/1295/files
Stats: 385195 lines in 5106 files changed: 295615 ins; 60531 del; 29049 mod
Patch: https://git.openjdk.org/valhalla/pull/1295.diff
Fetch: git fetch https://git.openjdk.org/valhalla.git pull/1295/head:pull/1295
PR: https://git.openjdk.org/valhalla/pull/1295
More information about the valhalla-dev
mailing list