hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 0d341d6969a0
Author:    mcimadamore
Date:      2019-05-23 22:13 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/0d341d6969a0

Automatic merge with default

- 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
- src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetC1_aarch64.cpp
- src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp
- src/hotspot/share/c1/c1_globals.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/g1/g1CollectorPolicy.cpp
- src/hotspot/share/gc/g1/g1CollectorPolicy.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/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/collectorPolicy.cpp
- src/hotspot/share/gc/shared/collectorPolicy.hpp
- src/hotspot/share/gc/shared/gcArguments.inline.hpp
- src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp
- src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp
- 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/systemDictionary_jvmci.hpp
- src/hotspot/share/opto/c2_globals.cpp
- 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.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/source/tree/MethodTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- 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/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/README
- 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/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/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