[lworld] RFR: Merge jdk

David Simms dsimms at openjdk.java.net
Thu Aug 19 09:10:57 UTC 2021


Merge tag 'jdk-18+11'
# Conflicts:
#	src/hotspot/share/classfile/javaClasses.inline.hpp
#	src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
#	src/hotspot/share/opto/macroArrayCopy.cpp
#	src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java

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

Commit messages:
 - Merge tag 'jdk-18+11' into lworld_merge_jdk_18_11
 - 8272573: Redundant unique_concrete_method_4 dependencies
 - 8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon
 - 8272626: Avoid C-style array declarations in java.*
 - 8271276: C2: Wrong JVM state used for receiver null check
 - 8272567: [IR Framework] Make AbstractInfo.getRandom() static
 - 8269951: [macos] Focus not painted in JButton when  setBorderPainted(false) is invoked
 - 8272558: IR Test Framework README misses some flags
 - 8272398: Update DockerTestUtils.buildJdkDockerImage()
 - 8270835: regression after JDK-8261006
 - ... and 142 more: https://git.openjdk.java.net/valhalla/compare/b0219dc8...60ff8b64

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

Changes: https://git.openjdk.java.net/valhalla/pull/535/files
  Stats: 20617 lines in 750 files changed: 15764 ins; 2564 del; 2289 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/535.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/535/head:pull/535

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


More information about the valhalla-dev mailing list