hg: amber/amber: manual merge with default

vicente.romero at oracle.com vicente.romero at oracle.com
Wed Jan 23 22:05:57 UTC 2019


Changeset: 92121359c6de
Author:    vromero
Date:      2019-01-23 17:05 -0500
URL:       http://hg.openjdk.java.net/amber/amber/rev/92121359c6de

manual merge with default

! make/Main.gmk
! make/RunTests.gmk
! make/autoconf/basics.m4
! make/autoconf/spec.gmk.in
! make/hotspot/ide/CreateVSProject.gmk
! src/hotspot/share/c1/c1_GraphBuilder.cpp
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/verifier.cpp
! src/hotspot/share/classfile/verifier.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/gc/g1/evacuationInfo.hpp
! src/hotspot/share/interpreter/linkResolver.cpp
! src/hotspot/share/interpreter/linkResolver.hpp
! src/hotspot/share/interpreter/templateTable.hpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/universe.hpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/constantPool.hpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/reflection.cpp
! src/hotspot/share/runtime/signature.hpp
! src/hotspot/share/utilities/constantTag.hpp
! src/hotspot/share/utilities/exceptions.hpp
! src/hotspot/share/utilities/globalDefinitions.hpp
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/Long.java
! src/java.base/share/classes/java/lang/String.java
! src/java.base/share/classes/java/lang/constant/ClassDesc.java
! src/java.base/share/classes/java/lang/constant/ConstantUtils.java
! src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
! src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java
! src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
! src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
! src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
! src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
- src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
- src/java.base/unix/native/libnio/ch/SocketDispatcher.c
- src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
- src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java
- src/java.desktop/share/classes/sun/awt/TracedEventQueue.java
- src/java.desktop/share/classes/sun/awt/image/BadDepthException.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.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/MemberEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/jdk/java/lang/String/AlignIndent.java
! test/jdk/java/lang/constant/ClassDescTest.java
! test/jdk/java/lang/constant/CondyDescTest.java
! test/jdk/java/lang/constant/boottest/java.base/java/lang/constant/ConstantUtilsTest.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
! test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
- test/jdk/javax/net/ssl/compatibility/Parameter.java
- test/jdk/sun/security/util/Resources/NewNamesFormat.java
- test/jdk/sun/security/util/Resources/NewResourcesNames.java
- test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLankmarkRegions.java
! test/langtools/jdk/javadoc/lib/javadoc/tester/JavadocTester.java
- test/langtools/tools/javac/RawStringLiteralLang.java
- test/langtools/tools/javac/RawStringLiteralLangAPI.java
- test/langtools/tools/javac/diags/examples/RawStringLiteral.java



More information about the amber-dev mailing list