hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Thu Jan 31 21:08:02 UTC 2019
Changeset: 69477578c25a
Author: mcimadamore
Date: 2019-01-31 22:07 +0100
URL: http://hg.openjdk.java.net/amber/amber/rev/69477578c25a
Automatic merge with default
! make/GenerateLinkOptData.gmk
! make/RunTests.gmk
! make/autoconf/compare.sh.in
+ make/common/CopyFiles.gmk
! make/common/MakeBase.gmk
+ make/common/MakeIO.gmk
+ make/common/Utils.gmk
! make/devkit/Tools.gmk
! make/scripts/compare.sh
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/ci/ciReplay.cpp
! src/hotspot/share/ci/ciStreams.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/interpreter/bytecodeTracer.cpp
! src/hotspot/share/interpreter/interpreterRuntime.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/memory/universe.hpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/reflection.cpp
! src/java.base/share/classes/java/lang/String.java
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
- test/hotspot/jtreg/gc/g1/TestStringTableStats.java
- test/langtools/jdk/javadoc/doclet/testHtmlWarning/TestHtmlWarning.java
More information about the amber-dev
mailing list