hg: amber/amber: manual merge with default
vicente.romero at oracle.com
vicente.romero at oracle.com
Fri May 31 14:08:12 UTC 2019
Changeset: 8958d42ac38e
Author: vromero
Date: 2019-05-31 10:07 -0400
URL: http://hg.openjdk.java.net/amber/amber/rev/8958d42ac38e
manual merge with default
! .hgtags
! make/CompileJavaModules.gmk
! make/autoconf/flags-cflags.m4
! make/conf/jib-profiles.js
- make/data/cldr/common/main/ff_CM.xml
- make/data/cldr/common/main/ff_GN.xml
- make/data/cldr/common/main/ff_MR.xml
- make/data/cldr/common/main/ff_SN.xml
- make/data/cldr/common/main/yue_HK.xml
- make/data/cldr/common/supplemental/telephoneCodeData.xml
! make/test/JtregGraalUnit.gmk
! src/hotspot/cpu/aarch64/assembler_aarch64.hpp
- src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetC1_aarch64.cpp
- src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/os/bsd/os_bsd.cpp
! src/hotspot/os/linux/os_linux.cpp
! src/hotspot/os/windows/os_windows.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp
- src/hotspot/share/Xusage.txt
- src/hotspot/share/c1/c1_globals.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/symbolTable.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/code/codeHeapState.cpp
! src/hotspot/share/code/compiledMethod.hpp
! src/hotspot/share/code/nmethod.hpp
! src/hotspot/share/compiler/compileBroker.cpp
- src/hotspot/share/gc/cms/cmsCollectorPolicy.cpp
- src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp
- src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp
! src/hotspot/share/gc/epsilon/epsilonHeap.hpp
! src/hotspot/share/gc/g1/g1Allocator.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
- src/hotspot/share/gc/g1/g1CollectorPolicy.cpp
- src/hotspot/share/gc/g1/g1CollectorPolicy.hpp
! src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
! src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
- src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.cpp
- src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp
- src/hotspot/share/gc/g1/g1InCSetState.hpp
! src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp
- src/hotspot/share/gc/parallel/generationSizer.cpp
- src/hotspot/share/gc/parallel/generationSizer.hpp
- src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.cpp
- src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp
! src/hotspot/share/gc/shared/collectedHeap.cpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
- src/hotspot/share/gc/shared/collectorPolicy.cpp
- src/hotspot/share/gc/shared/collectorPolicy.hpp
- src/hotspot/share/gc/shared/gcArguments.inline.hpp
! src/hotspot/share/gc/shared/parallelCleaning.hpp
! src/hotspot/share/gc/shared/ptrQueue.hpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
- src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp
- src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp
! src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
! src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
! src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
- src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp
! src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp
! src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
! src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
- src/hotspot/share/gc/z/zCollectorPolicy.cpp
- src/hotspot/share/gc/z/zCollectorPolicy.hpp
- src/hotspot/share/gc/z/zPreMappedMemory.cpp
- src/hotspot/share/gc/z/zPreMappedMemory.hpp
- src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp
! src/hotspot/share/jvmci/jvmciCompiler.cpp
! src/hotspot/share/jvmci/jvmciEnv.cpp
! src/hotspot/share/jvmci/jvmciEnv.hpp
- src/hotspot/share/jvmci/systemDictionary_jvmci.hpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/memory/allocation.hpp
! src/hotspot/share/oops/arrayKlass.hpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/klass.hpp
! src/hotspot/share/oops/metadata.hpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/oops/methodData.hpp
! src/hotspot/share/oops/oop.hpp
! src/hotspot/share/oops/oopsHierarchy.hpp
! src/hotspot/share/oops/symbol.hpp
- src/hotspot/share/opto/c2_globals.cpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/compile.hpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/loopTransform.cpp
! src/hotspot/share/opto/loopnode.hpp
! src/hotspot/share/opto/loopopts.cpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/compilationPolicy.cpp
! src/hotspot/share/runtime/deoptimization.hpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/globals_extension.hpp
! src/hotspot/share/runtime/java.cpp
! src/hotspot/share/runtime/jniHandles.hpp
! src/hotspot/share/runtime/mutexLocker.hpp
! src/hotspot/share/runtime/os.hpp
! src/hotspot/share/runtime/osThread.hpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/thread.inline.hpp
! src/hotspot/share/runtime/tieredThresholdPolicy.cpp
! src/hotspot/share/utilities/concurrentHashTable.hpp
! src/hotspot/share/utilities/concurrentHashTable.inline.hpp
! src/hotspot/share/utilities/exceptions.hpp
! src/hotspot/share/utilities/globalDefinitions.hpp
! src/hotspot/share/utilities/ostream.hpp
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/Double.java
! src/java.base/share/classes/java/lang/Float.java
! src/java.base/share/classes/java/lang/Integer.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/Constable.java
! src/java.base/share/classes/java/lang/constant/ConstantDesc.java
! src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java
! src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java
! src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
! src/java.base/share/classes/java/util/Objects.java
! src/java.base/share/classes/module-info.java
! src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
! src/java.base/share/classes/sun/security/tools/keytool/Main.java
- src/java.base/share/classes/sun/text/resources/nfc.icu
- src/java.base/share/classes/sun/text/resources/nfkc.icu
- src/java.base/share/classes/sun/text/resources/nfkc_cf.icu
! src/java.base/share/conf/security/java.security
! src/java.base/unix/native/libnet/net_util_md.c
! src/java.base/unix/native/libnio/ch/Net.c
! src/java.base/windows/native/libnio/ch/Net.c
! src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
- src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpic.h
- src/java.desktop/share/native/libfreetype/src/autofit/afpic.c
- src/java.desktop/share/native/libfreetype/src/autofit/afpic.h
- src/java.desktop/share/native/libfreetype/src/base/basepic.c
- src/java.desktop/share/native/libfreetype/src/base/basepic.h
- src/java.desktop/share/native/libfreetype/src/base/ftapi.c
- src/java.desktop/share/native/libfreetype/src/base/ftpic.c
- src/java.desktop/share/native/libfreetype/src/base/md5.c
- src/java.desktop/share/native/libfreetype/src/base/md5.h
- src/java.desktop/share/native/libfreetype/src/cff/cffpic.c
- src/java.desktop/share/native/libfreetype/src/cff/cffpic.h
- src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.c
- src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.h
- src/java.desktop/share/native/libfreetype/src/psnames/pspic.c
- src/java.desktop/share/native/libfreetype/src/psnames/pspic.h
- src/java.desktop/share/native/libfreetype/src/raster/rastpic.c
- src/java.desktop/share/native/libfreetype/src/raster/rastpic.h
- src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.c
- src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.h
- src/java.desktop/share/native/libfreetype/src/smooth/ftspic.c
- src/java.desktop/share/native/libfreetype/src/smooth/ftspic.h
- src/java.desktop/share/native/libfreetype/src/truetype/ttpic.c
- src/java.desktop/share/native/libfreetype/src/truetype/ttpic.h
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/module-info.java
! src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
! src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPhysicalMemoryManager.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/.checkstyle_checks.xml
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerSubstitutions.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64LongSubstitutions.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithSlowPathNode.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.3.1.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-migrate-3.0.1.js
- src/jdk.javadoc/share/legal/jquery-migrate.md
- test/fmw/gtest/CHANGES
- test/fmw/gtest/LICENSE
- test/fmw/gtest/README
- test/fmw/gtest/include/gtest/gtest-death-test.h
- test/fmw/gtest/include/gtest/gtest-message.h
- test/fmw/gtest/include/gtest/gtest-param-test.h
- test/fmw/gtest/include/gtest/gtest-param-test.h.pump
- test/fmw/gtest/include/gtest/gtest-printers.h
- test/fmw/gtest/include/gtest/gtest-spi.h
- test/fmw/gtest/include/gtest/gtest-test-part.h
- test/fmw/gtest/include/gtest/gtest-typed-test.h
- test/fmw/gtest/include/gtest/gtest.h
- test/fmw/gtest/include/gtest/gtest_pred_impl.h
- test/fmw/gtest/include/gtest/gtest_prod.h
- test/fmw/gtest/include/gtest/internal/gtest-death-test-internal.h
- test/fmw/gtest/include/gtest/internal/gtest-filepath.h
- test/fmw/gtest/include/gtest/internal/gtest-internal.h
- test/fmw/gtest/include/gtest/internal/gtest-linked_ptr.h
- test/fmw/gtest/include/gtest/internal/gtest-param-util-generated.h
- test/fmw/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
- test/fmw/gtest/include/gtest/internal/gtest-param-util.h
- test/fmw/gtest/include/gtest/internal/gtest-port.h
- test/fmw/gtest/include/gtest/internal/gtest-string.h
- test/fmw/gtest/include/gtest/internal/gtest-tuple.h
- test/fmw/gtest/include/gtest/internal/gtest-tuple.h.pump
- test/fmw/gtest/include/gtest/internal/gtest-type-util.h
- test/fmw/gtest/include/gtest/internal/gtest-type-util.h.pump
- test/fmw/gtest/src/gtest-all.cc
- test/fmw/gtest/src/gtest-death-test.cc
- test/fmw/gtest/src/gtest-filepath.cc
- test/fmw/gtest/src/gtest-internal-inl.h
- test/fmw/gtest/src/gtest-port.cc
- test/fmw/gtest/src/gtest-printers.cc
- test/fmw/gtest/src/gtest-test-part.cc
- test/fmw/gtest/src/gtest-typed-test.cc
- test/fmw/gtest/src/gtest.cc
- test/fmw/gtest/src/gtest_main.cc
! test/hotspot/jtreg/ProblemList.txt
! test/jdk/ProblemList.txt
- test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java
- test/jdk/java/lang/Character/PropList.txt
- test/jdk/java/lang/Character/PropertyValueAliases.txt
- test/jdk/java/lang/Character/Scripts.txt
- test/jdk/java/lang/Character/SpecialCasing.txt
- test/jdk/java/lang/Character/UnicodeBlock/Blocks.txt
- test/jdk/java/lang/Character/UnicodeData.txt
- test/jdk/java/lang/Character/charprop00.bin
- test/jdk/java/lang/Character/charprop01.bin
- test/jdk/java/lang/Character/charprop02.bin
- test/jdk/java/lang/Character/charprop03.bin
- test/jdk/java/lang/Character/charprop0E.bin
- test/jdk/java/lang/Character/charprop0F.bin
- test/jdk/java/lang/Character/charprop10.bin
- test/jdk/java/lang/String/concat/StringConcatFactoryEmptyMethods.java
! test/jdk/java/lang/constant/ClassDescTest.java
! test/jdk/java/lang/constant/MethodHandleDescTest.java
! test/jdk/java/lang/constant/MethodTypeDescTest.java
- test/jdk/java/net/Socket/OldImpl.java
- test/jdk/java/net/Socket/OldSocketImpl.java
- test/jdk/java/net/Socket/OldSocketImplTestDriver.java
- test/jdk/java/nio/channels/SocketChannel/Stream.java
! test/jdk/java/util/Formatter/Basic-X.java.template
! test/jdk/java/util/Formatter/BasicBigDecimal.java
! test/jdk/java/util/Formatter/BasicBigInteger.java
! test/jdk/java/util/Formatter/BasicDouble.java
! test/jdk/java/util/Formatter/BasicDoubleObject.java
! test/jdk/java/util/Formatter/BasicFloat.java
! test/jdk/java/util/Formatter/BasicInt.java
! test/jdk/java/util/Formatter/BasicLong.java
- test/jdk/java/util/regex/GraphemeBreakProperty.txt
- test/jdk/java/util/regex/GraphemeBreakTest.txt
- test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java
- test/jdk/jdk/nio/zipfs/jarfs/root/dir1/leaf1.txt
- test/jdk/jdk/nio/zipfs/jarfs/root/dir1/leaf2.txt
- test/jdk/jdk/nio/zipfs/jarfs/root/dir2/leaf3.txt
- test/jdk/jdk/nio/zipfs/jarfs/root/dir2/leaf4.txt
- test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf1.txt
- test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf2.txt
- test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf3.txt
- test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf4.txt
- test/jdk/sun/management/windows/revokeall.c
- test/jdk/sun/management/windows/revokeall.exe
- test/jdk/sun/security/pkcs11/tls/tls12/TestTLS12.java
More information about the amber-dev
mailing list