[lworld] Integrated: Merge jdk
David Simms
dsimms at openjdk.org
Thu Oct 27 11:28:31 UTC 2022
On Thu, 27 Oct 2022 08:52:53 GMT, David Simms <dsimms at openjdk.org> wrote:
> Merge tag 'jdk-20+21' into lworld_merge_jdk_20_21
>
> # Conflicts:
> # src/hotspot/share/oops/constantPool.cpp
> # src/hotspot/share/oops/method.cpp
> # src/hotspot/share/oops/method.hpp
> # src/hotspot/share/runtime/sharedRuntime.cpp
> # src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
> # src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
This pull request has now been integrated.
Changeset: 21973951
Author: David Simms <dsimms at openjdk.org>
URL: https://git.openjdk.org/valhalla/commit/2197395184149a900efa7c95f9bb9cfc926e29d0
Stats: 144412 lines in 1016 files changed: 83807 ins; 29949 del; 30656 mod
Merge jdk
Merge tag 'jdk-20+21'
-------------
PR: https://git.openjdk.org/valhalla/pull/801
More information about the valhalla-dev
mailing list