[lworld] RFR: Merge jdk [v2]

David Simms dsimms at openjdk.java.net
Thu Aug 19 09:54:13 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

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

 - Merge tag 'jdk-18+11' into lworld_merge_jdk_18_11
   
   Added tag jdk-18+11 for changeset 96107e31
   
   # 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
 - 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
 - 8272400: [lworld] serviceability/sa/CDSJMapClstats.java fails: No suitable match for type of address
   
   Reviewed-by: fparain
 - 8272511: [lworld] Disable PhaseIdealLoop::try_sink_out_of_loop until optimization is stable in mainline
 - 8272290: [lworld] Disable CDS if InlineTypePassFieldsAsArgs has changed
   
   Reviewed-by: mchung, fparain
 - 8272307: [lworld] [AArch64] TestCallingConventionC1 test63 and test64 get incorrect result
   
   Reviewed-by: thartmann
 - 8272041: [lworld] CDS heap dump fails with primitive objects
   
   Reviewed-by: fparain, mchung
 - 8271924: [lworld] Crashes in ZBarrierSetRuntime::load_barrier_on_oop_array
 - ... and 1231 more: https://git.openjdk.java.net/valhalla/compare/96107e31...60ff8b64

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

Changes: https://git.openjdk.java.net/valhalla/pull/535/files
 Webrev: https://webrevs.openjdk.java.net/?repo=valhalla&pr=535&range=01
  Stats: 154066 lines in 1504 files changed: 145921 ins; 1716 del; 6429 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