[lworld] RFR: Merge jdk

David Simms dsimms at openjdk.org
Thu Oct 27 09:02:12 UTC 2022


Merge tag 'jdk-20+21' into lworld_merge_jdk_20_21

# Conflicts:
#	src/hotspot/share/oops/constantPool.cpp
#	src/hotspot/share/oops/method.cpp
#	src/hotspot/share/oops/method.hpp
#	src/hotspot/share/runtime/sharedRuntime.cpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java

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

Commit messages:
 - Merge tag 'jdk-20+21' into lworld_merge_jdk_20_21
 - 8295823: Use enhanced-for cycle instead of Enumeration in java.naming
 - 8293093: NPE in P11KeyStore.getID
 - 8265441: IGV: select block nodes by clicking on it
 - 8295879: JFR: Remove warnings in the jdk.jfr module
 - 8295402: G1: Tighten assertion in G1ScanHRForRegionClosure::scan_heap_roots
 - 8294752: G1: Remove redundant checks in check_obj_during_refinement
 - 8295889: NMT preinit code does not handle allocation errors
 - 8295868: 32-bit Windows build failures after JDK-8294466
 - 8295885: GHA: Bump gcc versions
 - ... and 81 more: https://git.openjdk.org/valhalla/compare/eef5d0bd...ef135072

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

Changes: https://git.openjdk.org/valhalla/pull/801/files
  Stats: 144412 lines in 1016 files changed: 83807 ins; 29949 del; 30656 mod
  Patch: https://git.openjdk.org/valhalla/pull/801.diff
  Fetch: git fetch https://git.openjdk.org/valhalla pull/801/head:pull/801

PR: https://git.openjdk.org/valhalla/pull/801



More information about the valhalla-dev mailing list