[lworld] Integrated: Merge jdk

David Simms dsimms at openjdk.java.net
Mon Aug 24 10:03:57 UTC 2020


Merge tag 'jdk-16+5'

# Conflicts:
#	src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
#	src/hotspot/share/memory/metaspaceShared.cpp
#	src/hotspot/share/opto/cfgnode.cpp
#	src/hotspot/share/opto/memnode.cpp
#	src/hotspot/share/opto/subnode.cpp
#	src/hotspot/share/opto/subnode.hpp

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

Commit messages:
 - More trailing whitespace
 - Merge tag 'jdk-16+5' into lworld_merge_jdk_16_5
 - 8248016: JFR: Remove Javadoc warnings
 - 8248701: On Windows generated modules-deps.gmk can contain backslash-r (CR) characters
 - 8248865: Document JNDI/LDAP timeout properties
 - 8248231: deserializeLambda created with wrong encoding if platform encoding not UTF-8
 - 8247762: [aarch64] Timeout in .../HeapDumpTestWithActiveProcess.java due to inf. loop in AARCH64CurrentFrameGuess.run()
 - 8244764: Improve assertion for CPP_VTABLE_PATCH_TYPES_DO
 - 8249002: New serviceability/sa/ClhsdbFindPC.java #id2 and #id3 tests are failing with ZGC
 - 8223955: Eliminate or reduce mixing of old File API and new Path/Files APIs
 - ... and 81 more: https://git.openjdk.java.net/valhalla/compare/c75f0f14...a380f3f1

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - lworld: https://webrevs.openjdk.java.net/valhalla/162/webrev.00.0
 - jdk: https://webrevs.openjdk.java.net/valhalla/162/webrev.00.1

Changes: https://git.openjdk.java.net/valhalla/pull/162/files
  Stats: 13592 lines in 438 files changed: 8858 ins; 2240 del; 2494 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/162.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/162/head:pull/162

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


More information about the valhalla-dev mailing list