[lworld] FYI: Merge jdk

David Simms dsimms at openjdk.java.net
Wed Jun 10 19:07:57 UTC 2020


Merge tag 'jdk-15+26' into lworld_merge_jdk_15_26
Added tag jdk-15+26 for changeset 0a32396f7a69

# Conflicts:
#	src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/classfile/javaClasses.cpp
#	src/hotspot/share/classfile/javaClasses.hpp
#	src/hotspot/share/oops/instanceKlass.hpp
#	src/hotspot/share/opto/type.cpp
#	src/hotspot/share/runtime/synchronizer.cpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java

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

Commit messages:
 - Merge tag 'jdk-15+26' into lworld_merge_jdk_15_26
 - 8246458: Shenandoah: TestAllocObjects.java test fail with -XX:+ShenandoahVerify
 - 8246095: Tweaks to memory access API
 - 8238763: ObjectInputStream readUnshared method handling of Records
 - 8244278: Excessive code cache flushes and sweeps
 - 8244660: Code cache sweeper heuristics is broken
 - 8244658: Remove dead code in code cache sweeper
 - 8245658: Arrays.java has two occurrences of bad unicode constants in Javadoc
 - 8246434: Threads::print_on_error assumes that the heap has been set up
 - 8246258: Enable hs_err heap printing earlier during initialization
 - ... and 106 more: https://git.openjdk.java.net/valhalla/compare/4bca44eb...89b5cb3c

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

Changes: https://git.openjdk.java.net/valhalla/pull/76/files
  Stats: 28970 lines in 930 files changed: 15936 ins; 9873 del; 3161 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/76.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/76/head:pull/76

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


More information about the valhalla-dev mailing list