[lworld] Integrated: Merge jdk
David Simms
dsimms at openjdk.java.net
Thu Aug 19 09:54:16 UTC 2021
On Thu, 19 Aug 2021 09:03:04 GMT, David Simms <dsimms at openjdk.org> wrote:
> Merge tag 'jdk-18+11'
> # Conflicts:
> # src/hotspot/share/classfile/javaClasses.inline.hpp
> # src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
> # src/hotspot/share/opto/macroArrayCopy.cpp
> # src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
This pull request has now been integrated.
Changeset: 55f8d9eb
Author: David Simms <dsimms at openjdk.org>
URL: https://git.openjdk.java.net/valhalla/commit/55f8d9eb5d182a9104e7d133d03f93b94cfd5b28
Stats: 20617 lines in 750 files changed: 15764 ins; 2564 del; 2289 mod
Merge jdk
Merge tag 'jdk-18+11'
-------------
PR: https://git.openjdk.java.net/valhalla/pull/535
More information about the valhalla-dev
mailing list