[lworld] RFR: Merge jdk

David Simms dsimms at openjdk.java.net
Wed Jun 10 06:53:08 UTC 2020


On Tue, 9 Jun 2020 14:08:04 GMT, David Simms <dsimms at openjdk.org> wrote:

>> 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
>
> Test issues, on hold

Filed JDK-8247298 and JDK-8247299 to address use of bias locking at a later date, re-enabled UseBiasedLocking as
default as temporary work-around.

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

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


More information about the valhalla-dev mailing list