hg: loom/loom: Merge

[alan.bateman at oracle.com]

Changeset: b32f46b58fd6
Author:    alanb
Date:      2019-05-24 14:44 +0100
URL:       http://hg.openjdk.java.net/loom/loom/rev/b32f46b58fd6

Merge

- 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/cpu/x86/stubGenerator_x86_64.cpp
- src/hotspot/share/c1/c1_globals.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
- 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/include/jvm.h
- src/hotspot/share/opto/c2_globals.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmti.xml
! src/hotspot/share/prims/jvmtiEnvBase.hpp
! src/hotspot/share/prims/jvmtiExport.cpp
! src/hotspot/share/prims/jvmtiExport.hpp
! src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
! src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
! src/java.base/share/classes/java/net/ServerSocket.java
! src/java.base/share/classes/java/net/Socket.java
! src/java.base/share/classes/java/net/SocketImpl.java
! src/java.base/share/classes/java/net/SocksSocketImpl.java
! src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
! src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
! src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
! src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
! src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
! src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
! src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
! src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java
! src/java.base/windows/native/libnio/ch/Net.c
- 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.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPhysicalMemoryManager.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
! src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
! src/jdk.jfr/share/conf/jfr/profile.jfc
- test/fmw/gtest/README
! test/jdk/ProblemList.txt
- test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java
- test/jdk/java/net/Socket/OldImpl.java
- test/jdk/java/net/Socket/OldSocketImpl.java
- test/jdk/java/net/Socket/OldSocketImplTestDriver.java
- test/jdk/sun/management/windows/revokeall.c
- test/jdk/sun/management/windows/revokeall.exe
! test/jdk/sun/net/www/httptest/TestHttpServer.java