[Integrated] [lworld] RFR: Merge jdk

David Simms dsimms at openjdk.java.net
Tue Jun 9 10:05:20 UTC 2020


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

> Merge tag 'jdk-15+23' into lworld_merge_jdk_15_23
> Added tag jdk-15+23 for changeset f143729ca00e
> 
> # Conflicts:
> #	src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
> #	src/hotspot/cpu/x86/macroAssembler_x86.hpp
> #	src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
> #	src/hotspot/cpu/x86/templateTable_x86.cpp
> #	src/hotspot/cpu/x86/vtableStubs_x86_64.cpp
> #	src/hotspot/share/classfile/fieldLayoutBuilder.cpp
> #	src/hotspot/share/classfile/fieldLayoutBuilder.hpp
> #	src/hotspot/share/opto/phasetype.hpp
> #	src/hotspot/share/prims/jni.cpp

This pull request has now been integrated.

Changeset: 2f51c64b
Author:    David Simms <dsimms at openjdk.org>
URL:       https://git.openjdk.java.net/valhalla/commit/2f51c64b
Stats:     8310 lines in 309 files changed: 2006 ins; 5089 del; 1215 mod

Merge jdk

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

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


More information about the valhalla-dev mailing list