[lworld] Integrated: Merge jdk

David Simms dsimms at openjdk.java.net
Fri Nov 13 12:36:10 UTC 2020


On Fri, 13 Nov 2020 09:30:53 GMT, David Simms <dsimms at openjdk.org> wrote:

> Merge tag 'jdk-16+24' into lworld_merge_jdk_16_24
> Added tag jdk-16+24 for changeset bfa060f0
> 
> # Conflicts:
> #	src/hotspot/share/classfile/classFileParser.cpp
> #	src/hotspot/share/oops/fieldInfo.hpp
> #	src/hotspot/share/oops/fieldStreams.hpp
> #	src/hotspot/share/opto/arraycopynode.cpp
> #	src/hotspot/share/opto/arraycopynode.hpp
> #	src/hotspot/share/runtime/synchronizer.cpp

This pull request has now been integrated.

Changeset: 74e40a56
Author:    David Simms <dsimms at openjdk.org>
URL:       https://git.openjdk.java.net/valhalla/commit/74e40a56
Stats:     59225 lines in 766 files changed: 32476 ins; 17832 del; 8917 mod

Merge jdk

Merge tag 'jdk-16+24'

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

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


More information about the valhalla-dev mailing list