[lworld] RFR: Merge jdk

David Simms dsimms at openjdk.java.net
Thu Oct 29 08:46:16 UTC 2020


Merge tag 'jdk-16+22'

# Conflicts:
#	.github/workflows/submit.yml
#	src/hotspot/share/memory/dynamicArchive.cpp
#	src/hotspot/share/oops/method.cpp
#	src/hotspot/share/opto/parse2.cpp
#	src/hotspot/share/opto/runtime.cpp
#	src/hotspot/share/runtime/sharedRuntime.cpp
#	src/hotspot/share/runtime/sharedRuntime.hpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java

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

Commit messages:
 - Merge tag 'jdk-16+22' into lworld_merge_jdk_16_22
 - 8255555: Bad copyright headers in SocketChannelCompare.java SocketChannelConnectionSetup.java UnixSocketChannelReadWrite.java
 - 8253939: [TESTBUG] Increase coverage of the cgroups detection code
 - 8255554: Bad copyright header in AbstractFileSystemProvider.java
 - 8255457: Shenandoah: cleanup ShenandoahMarkTask
 - 8255441: Cleanup ciEnv/jvmciEnv::lookup_method-s
 - 8255014: Record Classes javax.lang.model changes, follow-up
 - 8245194: Unix domain socket channel implementation
 - 8255013: implement Record Classes as a standard feature in Java, follow-up
 - 8255429: Remove C2-based profiling
 - ... and 28 more: https://git.openjdk.java.net/valhalla/compare/756943d5...76559c92

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

Changes: https://git.openjdk.java.net/valhalla/pull/247/files
  Stats: 9900 lines in 311 files changed: 6601 ins; 2246 del; 1053 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/247.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/247/head:pull/247

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



More information about the valhalla-dev mailing list