[lworld] RFR: Merge jdk [v2]

David Simms dsimms at openjdk.java.net
Wed Mar 30 07:21:19 UTC 2022


> Merge tag 'jdk-19+15' into lworld_merge_jdk_19_15
> compiler/arraycopy/TestArrayCopyAsLoadsStores.java needs more work, post commit

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

 - compiler/arraycopy/TestArrayCopyAsLoadsStores.java needs more work, post commit
 - Adjust Testing
 - Bug with JDK-8281732
 - Original merge conflicts
 - Merge tag 'jdk-19+15' into lworld_merge_jdk_19_15
   
   Added tag jdk-19+15 for changeset 78ef2fde
   
   # Conflicts:
   #	src/hotspot/cpu/aarch64/frame_aarch64.cpp
   #	src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
   #	src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
   #	src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
   #	src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
   #	src/hotspot/cpu/x86/macroAssembler_x86.cpp
   #	src/hotspot/cpu/x86/macroAssembler_x86.hpp
   #	src/hotspot/cpu/x86/templateTable_x86.cpp
   #	src/hotspot/share/ci/ciEnv.cpp
   #	src/hotspot/share/oops/instanceKlass.cpp
   #	src/hotspot/share/opto/arraycopynode.cpp
   #	src/hotspot/share/opto/escape.cpp
   #	src/hotspot/share/opto/phasetype.hpp
   #	src/hotspot/share/runtime/sharedRuntime.cpp
   #	src/hotspot/share/services/heapDumper.cpp
   #	src/hotspot/share/utilities/globalDefinitions.hpp
   #	src/java.base/share/classes/java/lang/constant/ClassDesc.java
   #	src/java.base/share/classes/java/lang/ref/SoftReference.java
   #	src/java.base/share/classes/java/lang/ref/WeakReference.java
   #	test/lib/jdk/test/lib/hprof/model/JavaValueArray.java
 - 8282695: [lworld] assert(oopDesc::is_oop(obj)) in compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java
   
   Reviewed-by: thartmann
 - 8282512: Remove usages of __WithField in compiler tests
   
   Reviewed-by: thartmann
 - 8282107: Valhalla: javac does not correctly recognize value class factory <init>
 - 8282079: [lworld] Generate Preload attribute in lambdas and proxies if value classes are referenced
   
   Reviewed-by: rriggs
 - 8282292: [lworld] runtime/valhalla/inlinetypes/WithFieldAccessorTest.java Xcomp C1 asserts
   
   Reviewed-by: thartmann
 - ... and 1343 more: https://git.openjdk.java.net/valhalla/compare/78ef2fde...ed94860f

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

Changes: https://git.openjdk.java.net/valhalla/pull/673/files
 Webrev: https://webrevs.openjdk.java.net/?repo=valhalla&pr=673&range=01
  Stats: 187554 lines in 1608 files changed: 179088 ins; 1926 del; 6540 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/673.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/673/head:pull/673

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



More information about the valhalla-dev mailing list