[Integrated] [lworld] FYI: Merge jdk

David Simms dsimms at openjdk.java.net
Wed Jun 10 19:07:59 UTC 2020


On Wed, 10 Jun 2020 15:26:57 GMT, David Simms <dsimms at openjdk.org> wrote:

> Merge tag 'jdk-15+26' into lworld_merge_jdk_15_26
> Added tag jdk-15+26 for changeset 0a32396f7a69
> 
> # Conflicts:
> #	src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp
> #	src/hotspot/share/classfile/classFileParser.cpp
> #	src/hotspot/share/classfile/javaClasses.cpp
> #	src/hotspot/share/classfile/javaClasses.hpp
> #	src/hotspot/share/oops/instanceKlass.hpp
> #	src/hotspot/share/opto/type.cpp
> #	src/hotspot/share/runtime/synchronizer.cpp
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java

This pull request has now been integrated.

Changeset: f8bcfccf
Author:    David Simms <dsimms at openjdk.org>
URL:       https://git.openjdk.java.net/valhalla/commit/f8bcfccf
Stats:     28959 lines in 930 files changed: 9862 ins; 15925 del; 3172 mod

Merge jdk

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

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


More information about the valhalla-dev mailing list