[lworld] Integrated: Merge jdk

David Simms dsimms at openjdk.java.net
Thu Sep 3 09:27:30 UTC 2020


Merge tag 'jdk-16+12' into lworld_merge_jdk_16_12
Added tag jdk-16+12 for changeset fc8e62b399bd

# Conflicts:
#	src/hotspot/share/memory/dynamicArchive.cpp
#	src/hotspot/share/memory/heapInspection.cpp
#	src/hotspot/share/memory/metaspaceClosure.hpp
#	src/hotspot/share/memory/metaspaceShared.cpp
#	src/hotspot/share/oops/markWord.hpp
#	src/hotspot/share/opto/memnode.cpp

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

Commit messages:
 - Merge tag 'jdk-16+12' into lworld_merge_jdk_16_12
 - 8251499: no-placeholder compact number patterns throw IllegalArgumentException
 - 8251490: [TESTBUG] The Java thread stack size specified is too small for nsk/stress/stack. Specify at least 448k
 - 8251454: Wrong "self type" in DCTree.DCEndElement
 - 8251357: [DocCommentParser] Infinite loop while looking for the end of a preamble
 - 8246047: Replace LinkedList impl in net.http.websocket.BuilderImpl
 - 8251888: Move HotSpot Style Guide wiki subpages to jdk/jdk/doc
 - 8251715: Throw UncheckedIOException in place of InternalError when HttpClient fails due to unavailability of underlying resources required by SSLContext
 - 8250748: Doc of URL(String, String, int, String, URLStreamHandler) does not use link
 - 8249902: tools/javac/records/mandated_members/read_resolve_method/CheckReadResolveMethodTest.java uses @ignore w/o bug-id
 - ... and 77 more: https://git.openjdk.java.net/valhalla/compare/e02fecec...cd46841e

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

Changes: https://git.openjdk.java.net/valhalla/pull/176/files
  Stats: 9849 lines in 338 files changed: 5203 ins; 2240 del; 2406 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/176.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/176/head:pull/176

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


More information about the valhalla-dev mailing list