[lworld] RFR: Merge jdk [v2]

David Simms dsimms at openjdk.java.net
Thu Aug 5 10:08:24 UTC 2021


> Merge tag 'jdk-18+9'
> 
> # Conflicts:
> #	src/hotspot/cpu/aarch64/aarch64.ad
> #	src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
> #	src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
> #	src/hotspot/share/opto/compile.cpp
> #	src/java.base/share/classes/java/lang/Class.java
> #	test/hotspot/jtreg/ProblemList.txt

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

 - Merge tag 'jdk-18+9' into lworld_merge_jdk_18_9
   
   Added tag jdk-18+9 for changeset 0a27f264
   
   # Conflicts:
   #	src/hotspot/cpu/aarch64/aarch64.ad
   #	src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
   #	src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
   #	src/hotspot/share/opto/compile.cpp
   #	src/java.base/share/classes/java/lang/Class.java
   #	test/hotspot/jtreg/ProblemList.txt
 - 8271710: [lworld] Unsafe compareAndSet/Exchange C2 intrinsics should support inline types
 - 8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64
   
   Reviewed-by: chagedorn, thartmann
 - 8271234: [lworld] InlineTypeBaseNode::merge_with fails with assert(i < _cnt)
 - 8264340: [lworld] [AArch64] TestLWorld.java assertion failure in OopFlow::build_oop_map
   
   Reviewed-by: thartmann
 - 8271405: [lworld] Redo test/jdk/java/lang/invoke/VarHandles changes for JDK-8269956
 - 8271536: [lworld] VerifyError in hotspot/jtreg/runtime/classFileParserBug/NameAndTypeSig.java
   
   Reviewed-by: fparain
 - 8271508: [lworld] disallow primitive classes with super_class of 0
   
   Reviewed-by: dsimms
 - 8271544: [lworld] GraphBuilder::withfield should handle identity class holder
 - Merge jdk
   
   Merge tag 'jdk-18+8'
 - ... and 1221 more: https://git.openjdk.java.net/valhalla/compare/0a27f264...2d7d45f7

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

Changes: https://git.openjdk.java.net/valhalla/pull/524/files
 Webrev: https://webrevs.openjdk.java.net/?repo=valhalla&pr=524&range=01
  Stats: 153763 lines in 1493 files changed: 145646 ins; 1716 del; 6401 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/524.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/524/head:pull/524

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


More information about the valhalla-dev mailing list