[lworld] RFR: Merge jdk
David Simms
dsimms at openjdk.java.net
Tue Jun 9 09:03:05 UTC 2020
Merge tag 'jdk-15+23' into lworld_merge_jdk_15_23
Added tag jdk-15+23 for changeset f143729ca00e
# Conflicts:
# src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
# src/hotspot/cpu/x86/macroAssembler_x86.hpp
# src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
# src/hotspot/cpu/x86/templateTable_x86.cpp
# src/hotspot/cpu/x86/vtableStubs_x86_64.cpp
# src/hotspot/share/classfile/fieldLayoutBuilder.cpp
# src/hotspot/share/classfile/fieldLayoutBuilder.hpp
# src/hotspot/share/opto/phasetype.hpp
# src/hotspot/share/prims/jni.cpp
-------------
Commit messages:
- Merge tag 'jdk-15+23' into lworld_merge_jdk_15_23
- 8242934: test/jdk/jdk/jfr/tool/TestPrintJSON.java uses nashorn script engine
- 8244930: Building without test failure handler broken after JDK-8244844
- 8244758: DMG bundler ignores --install-dir option
- 8241825: Make compressed oops and compressed class pointers independent (x86_64, PPC, S390)
- 8244815: Always log MMU information in G1
- 8244714: G1 young gen sizer allows zero young gen with huge -XX:NewRatio
- 8244928: Build log output too verbose after JDK-8244844
- 8242188: [TESTBUG] error in jtreg test jdk/jfr/api/consumer/TestRecordedFrame.java on linux-aarch64
- 8244634: LoadLibraryW failed from tools/jpackage tests after JDK-8242302
- ... and 126 more: https://git.openjdk.java.net/valhalla/compare/3123ec30...c9cbc0b9
The webrevs contain the adjustments done while merging with regards to each parent branch:
- lworld: https://webrevs.openjdk.java.net/valhalla/69/webrev.00.0
- jdk: https://webrevs.openjdk.java.net/valhalla/69/webrev.00.1
Changes: https://git.openjdk.java.net/valhalla/pull/69/files
Stats: 8294 lines in 309 files changed: 5073 ins; 1990 del; 1231 mod
Patch: https://git.openjdk.java.net/valhalla/pull/69.diff
Fetch: git fetch https://git.openjdk.java.net/valhalla pull/69/head:pull/69
PR: https://git.openjdk.java.net/valhalla/pull/69
More information about the valhalla-dev
mailing list