[lworld] RFR: Merge jdk [v2]

David Simms dsimms at openjdk.java.net
Thu Aug 26 10:04:18 UTC 2021


> Merge tag 'jdk-18+12'
> 
> # Conflicts:
> #	src/hotspot/share/gc/shared/barrierSet.hpp
> #	src/hotspot/share/oops/access.hpp
> #	src/hotspot/share/oops/access.inline.hpp
> #	src/hotspot/share/oops/accessBackend.hpp
> #	src/hotspot/share/oops/markWord.hpp

David Simms has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 1247 commits:

 - Merge tag 'jdk-18+12' into lworld_merge_jdk_18_12
   
   Added tag jdk-18+12 for changeset 2ef68711
   
   # Conflicts:
   #	src/hotspot/share/gc/shared/barrierSet.hpp
   #	src/hotspot/share/oops/access.hpp
   #	src/hotspot/share/oops/access.inline.hpp
   #	src/hotspot/share/oops/accessBackend.hpp
   #	src/hotspot/share/oops/markWord.hpp
 - 8272760: [lworld] Aarch64 part of JDK-8272753
   
   Reviewed-by: thartmann
 - 8271583: [lworld] primitive records can't be reference favoring
   
   Reviewed-by: sadayapalam
 - 8272306: [lworld] Fix incorrectly merged code in classListParser.cpp
   
   Reviewed-by: dsimms
 - 8272793: [lworld] Test CustomClassListDump.java fails with Pattern "CustomLoadee id: [0-9]+ super: [0-9]+ source: .*/custom.jar" not found in classlist
 - 8272753: [lworld] "Invalid frame size" assert in frame::repair_sender_sp
 - Merge jdk
   
   Merge tag 'jdk-18+11'
 - 8272566: [lworld] [AArch64] G1 write barrier slow path needs to save more registers
   
   Reviewed-by: thartmann
 - 8272397: [lworld] Move ValueBootstrapMethods to java.lang.runtime
   
   Reviewed-by: fparain, rriggs
 - 8271556: [lworld] java.lang.BootstrapMethodError in .equals() for primitive record
   
   Reviewed-by: rriggs
 - ... and 1237 more: https://git.openjdk.java.net/valhalla/compare/2ef68711...17d46414

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

Changes: https://git.openjdk.java.net/valhalla/pull/540/files
 Webrev: https://webrevs.openjdk.java.net/?repo=valhalla&pr=540&range=01
  Stats: 154159 lines in 1505 files changed: 146009 ins; 1717 del; 6433 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/540.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/540/head:pull/540

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


More information about the valhalla-dev mailing list