[lworld] [Rev 01] RFR: Merge jdk

David Simms dsimms at openjdk.java.net
Wed Jun 10 06:52:44 UTC 2020


> Merge tag 'jdk-15+24' into lworld_merge_jdk_15_24
> Added tag jdk-15+24 for changeset 497fd9f9129c
> 
> # Conflicts:
> #	src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
> #	src/hotspot/share/classfile/javaClasses.hpp
> #	src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
> #	src/hotspot/share/memory/oopFactory.hpp
> #	src/hotspot/share/oops/access.hpp
> #	src/hotspot/share/oops/accessBackend.hpp
> #	src/hotspot/share/oops/accessDecorators.hpp
> #	src/hotspot/share/runtime/init.cpp
> #	src/hotspot/share/runtime/thread.hpp
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
> #	src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
> #	src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c
> #	src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c
> #	src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c
> #	src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c
> #	src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
> #	src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
> #	src/jdk.jdwp.agent/share/native/libjdwp/util.c
> #	test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java

David Simms has updated the pull request incrementally with one additional commit since the last revision:

  UseBiasLocking for always locked pattern

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

Changes:
  - all: https://git.openjdk.java.net/valhalla/pull/70/files
  - new: https://git.openjdk.java.net/valhalla/pull/70/files/20628a92..643499ba

Webrevs:
 - full: https://webrevs.openjdk.java.net/valhalla/70/webrev.01
 - incr: https://webrevs.openjdk.java.net/valhalla/70/webrev.00-01

  Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/70.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/70/head:pull/70

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


More information about the valhalla-dev mailing list