[lworld] RFR: Merge jdk
David Simms
dsimms at openjdk.org
Mon Oct 10 14:51:41 UTC 2022
Merge tag 'jdk-20+18' into lworld_merge_jdk_20_18
Added tag jdk-20+18 for changeset 0ec18382b
# Conflicts:
# src/hotspot/share/ci/ciSignature.cpp
# src/hotspot/share/opto/callnode.cpp
# src/hotspot/share/opto/callnode.hpp
# src/hotspot/share/opto/graphKit.cpp
# src/hotspot/share/opto/memnode.cpp
# src/hotspot/share/runtime/sharedRuntime.cpp
# src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java
-------------
Commit messages:
- (JDK-8295066) Revert "8242115: C2 SATB barriers are not safepoint-safe"
- Trailing whitespace
- Merge branch 'lworld' into lworld_merge_jdk_20_18
- Merge tag 'jdk-20+18' into lworld_merge_jdk_20_18
- 8294869: Correct failure of RemovedJDKInternals.java after JDK-8294618
- 8294397: Replace StringBuffer with StringBuilder within java.text
- 8294734: Redundant override in AES implementation
- 8294618: Update openjdk.java.net => openjdk.org
- 8294840: langtools OptionalDependencyTest.java use File.pathSeparator
- 8289925: Shared code shouldn't reference the platform specific method frame::interpreter_frame_last_sp()
- ... and 97 more: https://git.openjdk.org/valhalla/compare/7c569cd2...36781877
The webrevs contain the adjustments done while merging with regards to each parent branch:
- lworld: https://webrevs.openjdk.org/?repo=valhalla&pr=784&range=00.0
- jdk: https://webrevs.openjdk.org/?repo=valhalla&pr=784&range=00.1
Changes: https://git.openjdk.org/valhalla/pull/784/files
Stats: 12855 lines in 388 files changed: 7926 ins; 3377 del; 1552 mod
Patch: https://git.openjdk.org/valhalla/pull/784.diff
Fetch: git fetch https://git.openjdk.org/valhalla pull/784/head:pull/784
PR: https://git.openjdk.org/valhalla/pull/784
More information about the valhalla-dev
mailing list