[lworld] Integrated: Merge jdk
David Simms
dsimms at openjdk.java.net
Thu Oct 29 10:01:54 UTC 2020
On Thu, 29 Oct 2020 08:40:18 GMT, David Simms <dsimms at openjdk.org> wrote:
> Merge tag 'jdk-16+22'
>
> # Conflicts:
> # .github/workflows/submit.yml
> # src/hotspot/share/memory/dynamicArchive.cpp
> # src/hotspot/share/oops/method.cpp
> # src/hotspot/share/opto/parse2.cpp
> # src/hotspot/share/opto/runtime.cpp
> # src/hotspot/share/runtime/sharedRuntime.cpp
> # src/hotspot/share/runtime/sharedRuntime.hpp
> # src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
> # src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
This pull request has now been integrated.
Changeset: 7e616ce3
Author: David Simms <dsimms at openjdk.org>
URL: https://git.openjdk.java.net/valhalla/commit/7e616ce3
Stats: 9900 lines in 311 files changed: 6601 ins; 2246 del; 1053 mod
Merge jdk
Merge tag 'jdk-16+22'
-------------
PR: https://git.openjdk.java.net/valhalla/pull/247
More information about the valhalla-dev
mailing list