[lworld] RFR: Merge jdk

David Simms dsimms at openjdk.java.net
Tue Sep 7 13:22:27 UTC 2021


Merge tag 'jdk-18+13'

# Conflicts:
#	src/hotspot/share/opto/escape.cpp
#	src/hotspot/share/opto/library_call.cpp
#	src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
#	test/jdk/java/lang/runtime/ObjectMethodsTest.java

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

Commit messages:
 - Merge tag 'jdk-18+13' into lworld_merge_jdk_18_13
 - 8272377: assert preconditions that are ensured when created in add_final_edges
 - 8272563: assert(is_double_stack() && !is_virtual()) failed: type check
 - 8273176: handle latest VS2019 in abstract_vm_version
 - 8273206: jdk/jfr/event/gc/collection/TestG1ParallelPhases.java fails after JDK-8159979
 - 8272618: Unnecessary Attr.visitIdent.noOuterThisPath
 - 8272963: Update the java manpage markdown source
 - 8269770: nsk tests should start IOPipe channel before launch debuggee - Debugee.prepareDebugee
 - 8273197: ProblemList 2 jtools tests due to JDK-8273187
 - 8262186: Call X509KeyManager.chooseClientAlias once for all key types
 - ... and 56 more: https://git.openjdk.java.net/valhalla/compare/59fc2db4...525e0d5d

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - lworld: https://webrevs.openjdk.java.net/?repo=valhalla&pr=547&range=00.0
 - jdk: https://webrevs.openjdk.java.net/?repo=valhalla&pr=547&range=00.1

Changes: https://git.openjdk.java.net/valhalla/pull/547/files
  Stats: 6069 lines in 213 files changed: 2650 ins; 1579 del; 1840 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/547.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/547/head:pull/547

PR: https://git.openjdk.java.net/valhalla/pull/547


More information about the valhalla-dev mailing list