[lworld] RFR: Merge jdk
David Simms
dsimms at openjdk.java.net
Tue Jun 9 12:40:39 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
-------------
Commit messages:
- Merge tag 'jdk-15+24' into lworld_merge_jdk_15_24
- 8245051: c1 is broken if it is compiled by gcc without -fno-lifetime-dse
- 8244031: HttpClient should have more tests for HEAD requests
- 8244733: Add ResourceHashtable::xxx_if_absent
- 8245463: Shenandoah: refine ShenandoahPhaseTimings constructor arguments
- 8245461: Shenandoah: refine mode name()-s
- 8244416: Remove incorrect assert during inline cache cleaning
- 8245398: Remove addition preview adornment from String::formatted
- 8245281: Disabling hotspot gtest builds make it impossible to run tests
- 8245445: Langtools NetBeans ant build broken after JDK-8244093
- ... and 96 more: https://git.openjdk.java.net/valhalla/compare/2f51c64b...20628a92
The webrevs contain the adjustments done while merging with regards to each parent branch:
- lworld: https://webrevs.openjdk.java.net/valhalla/70/webrev.00.0
- jdk: https://webrevs.openjdk.java.net/valhalla/70/webrev.00.1
Changes: https://git.openjdk.java.net/valhalla/pull/70/files
Stats: 34398 lines in 761 files changed: 17778 ins; 12817 del; 3803 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