[lworld] RFR: Merge jdk [v2]

David Simms dsimms at openjdk.java.net
Wed Dec 2 08:56:49 UTC 2020


> Merge tag 'jdk-16+26'
> 
> * output.cpp: Ignore new assert for now

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

 - Ignore new assert for now
 - Fix logical compile errors from merge
 - Merge tag 'jdk-16+26' into lworld_merge_jdk_16_26
   
   Added tag jdk-16+26 for changeset 7aed9b65
   
   # Conflicts:
   #	.github/workflows/submit.yml
   #	src/hotspot/share/c1/c1_IR.hpp
   #	src/hotspot/share/ci/ciSignature.cpp
   #	src/hotspot/share/ci/ciSignature.hpp
   #	src/hotspot/share/ci/ciType.cpp
   #	src/hotspot/share/code/compiledMethod.cpp
   #	src/hotspot/share/code/pcDesc.hpp
   #	src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
   #	src/hotspot/share/opto/callGenerator.cpp
   #	src/hotspot/share/opto/graphKit.hpp
   #	src/hotspot/share/opto/macro.hpp
   #	src/hotspot/share/opto/output.cpp
   #	src/hotspot/share/runtime/sharedRuntime.hpp
   #	src/hotspot/share/runtime/vmOperations.hpp
   #	src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
   #	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
 - 8256929: [lworld] Fails to compile with --with-debug-level=optimized
 - Merge jdk
   
   Merge tag 'jdk-16+25'
 - 8256481: [lworld] C2 fails to eliminate GC barriers when replacing inline type buffer allocation
 - 8255995: templateTable_x86.cpp (TemplateTable::if_acmp) not always do correct null check.
   
   Reviewed-by: fparain, thartmann
 - 8238369: [lworld] Incorrect layout of inline type in flattened array.
   
   Reviewed-by: fparain
 - Disable further BiasedLocking tests
 - 8255522: [lworld] References to biased pattern remain in markWord::is_unlocked()
   
   Reviewed-by: fparain, skuksenko
 - ... and 1039 more: https://git.openjdk.java.net/valhalla/compare/7aed9b65...d9487db2

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

Changes: https://git.openjdk.java.net/valhalla/pull/286/files
 Webrev: https://webrevs.openjdk.java.net/?repo=valhalla&pr=286&range=01
  Stats: 152162 lines in 1338 files changed: 145352 ins; 2272 del; 4538 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/286.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/286/head:pull/286

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


More information about the valhalla-dev mailing list