[lworld] Integrated: Merge jdk

David Simms dsimms at openjdk.java.net
Thu Oct 1 10:18:38 UTC 2020


Merge tag 'jdk-16+18' into lworld_merge_jdk_16_18
Added tag jdk-16+18 for changeset e5ba020e

# Conflicts:
#	src/hotspot/share/gc/shared/memAllocator.cpp
#	src/hotspot/share/oops/accessBackend.hpp
#	src/hotspot/share/oops/oop.inline.hpp
#	src/hotspot/share/opto/compile.cpp
#	src/hotspot/share/opto/compile.hpp

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

Commit messages:
 - Merge tag 'jdk-16+18' into lworld_merge_jdk_16_18
 - 8253724: [lworld] C1 compilation hits assert: Empty inline type access should be removed
 - 8253744: [lworld] [lw3] Injected IdentityObject interface should not be hidden by the JVM
 - 8253663: [lworld] [lw3] TestJNIArrays crashes in jni_CreateSubElementSelector
 - 8253416: [lworld] C1: incorrect nestmate access to flattened field if nest-host is not loaded
 - 8253592: [lworld] C2: Additional fixes for handling empty inline types
 - Merge jdk
 - 8253511: [lworld] ClassFileParser does not handle field type mismatch
 - 8253181: [lworld] Javac fails to properly handle inline class files with inner classes
 - Merge jdk
 - ... and 991 more: https://git.openjdk.java.net/valhalla/compare/e5ba020e...72788d56

The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.

Changes: https://git.openjdk.java.net/valhalla/pull/204/files
  Stats: 147941 lines in 1322 files changed: 142212 ins; 1334 del; 4395 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/204.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/204/head:pull/204

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



More information about the valhalla-dev mailing list