hg: jdk/sandbox: Merge

[thomas.stuefe at gmail.com]

Changeset: 06365492f760
Author:    stuefe
Date:      2020-03-24 14:59 +0100
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/06365492f760

Merge

- make/CompileInterimRmic.gmk
- make/CopyInterimCLDRConverter.gmk
- make/Help.gmk
- make/autoconf/basics.m4
- make/autoconf/basics_windows.m4
- make/common/RMICompilation.gmk
- make/rmic/Rmic-java.management.rmi.gmk
- make/rmic/Rmic-java.rmi.gmk
- make/rmic/Rmic-jdk.naming.rmi.gmk
- make/rmic/RmicCommon.gmk
- src/demo/share/jfc/Font2DTest/Font2DTestApplet.java
- src/demo/share/jfc/SwingSet2/SwingSet2Applet.java
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.cpp
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.hpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.hpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.hpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.cpp
- src/hotspot/share/gc/parallel/psMarkSweep.cpp
- src/hotspot/share/gc/parallel/psMarkSweep.hpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
- src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp
! src/hotspot/share/gc/parallel/psParallelCompact.cpp
! src/hotspot/share/gc/shared/collectedHeap.cpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
- src/hotspot/share/gc/shared/concurrentGCPhaseManager.cpp
- src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp
! src/hotspot/share/gc/shared/gcTrace.cpp
! src/hotspot/share/gc/shared/gcVMOperations.cpp
! src/hotspot/share/gc/shared/gcVMOperations.hpp
! src/hotspot/share/gc/shared/genCollectedHeap.cpp
- src/hotspot/share/gc/shared/owstTaskTerminator.cpp
- src/hotspot/share/gc/shared/owstTaskTerminator.hpp
- src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.cpp
- src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp
! src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
! src/hotspot/share/gc/z/zCollectedHeap.cpp
! src/hotspot/share/gc/z/zCollectedHeap.hpp
! src/hotspot/share/memory/filemap.cpp
! src/hotspot/share/memory/metaspaceShared.cpp
! src/hotspot/share/memory/universe.cpp
- src/hotspot/share/runtime/fieldType.cpp
- src/hotspot/share/runtime/fieldType.hpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmOperations.cpp
! src/hotspot/share/services/memoryPool.cpp
- src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java
- src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java
- src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java
- src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
- src/java.base/share/classes/java/lang/reflect/ProxyGenerator_v49.java
- src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties
- src/java.base/share/classes/sun/net/idn/Punycode.java
- src/java.base/share/classes/sun/net/idn/StringPrep.java
- src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java
- src/java.base/share/classes/sun/net/idn/UCharacterDirection.java
- src/java.base/share/classes/sun/net/idn/UCharacterEnums.java
- src/java.base/share/classes/sun/text/bidi/BidiBase.java
- src/java.base/share/classes/sun/text/bidi/BidiLine.java
- src/java.base/share/classes/sun/text/bidi/BidiRun.java
- src/java.base/share/classes/sun/text/bidi/BidiWriter.java
- src/java.base/share/classes/sun/text/normalizer/BMPSet.java
- src/java.base/share/classes/sun/text/normalizer/CharTrie.java
- src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java
- src/java.base/share/classes/sun/text/normalizer/CodePointMap.java
- src/java.base/share/classes/sun/text/normalizer/CodePointTrie.java
- src/java.base/share/classes/sun/text/normalizer/FilteredNormalizer2.java
- src/java.base/share/classes/sun/text/normalizer/ICUBinary.java
- src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java
- src/java.base/share/classes/sun/text/normalizer/Normalizer2.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java
- src/java.base/share/classes/sun/text/normalizer/OutputInt.java
- src/java.base/share/classes/sun/text/normalizer/Replaceable.java
- src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java
- src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/Trie.java
- src/java.base/share/classes/sun/text/normalizer/Trie2.java
- src/java.base/share/classes/sun/text/normalizer/Trie2_16.java
- src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
- src/java.base/share/classes/sun/text/normalizer/UCharacter.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java
- src/java.base/share/classes/sun/text/normalizer/UTF16.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSetStringSpan.java
- src/java.base/share/classes/sun/text/normalizer/Utility.java
- src/java.base/share/classes/sun/text/normalizer/VersionInfo.java
- src/java.base/share/classes/sun/text/resources/nfc.nrm
- src/java.base/share/classes/sun/text/resources/nfkc.nrm
- src/java.base/share/classes/sun/text/resources/ubidi.icu
- src/java.base/share/classes/sun/text/resources/uprops.icu
- src/java.base/unix/classes/java/lang/ClassLoaderHelper.java
- src/java.base/windows/classes/java/lang/ClassLoaderHelper.java
- src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java
- src/jdk.internal.vm.compiler/.mx.graal/.project
- src/jdk.internal.vm.compiler/.mx.graal/.pydevproject
- src/jdk.internal.vm.compiler/.mx.graal/eclipse-settings/org.eclipse.jdt.core.prefs
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal.py
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal_9.py
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal_bench.py
- src/jdk.internal.vm.compiler/.mx.graal/outputparser.py
- src/jdk.internal.vm.compiler/.mx.graal/sanitycheck.py
- src/jdk.internal.vm.compiler/.mx.graal/suite.py
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MacroAssemblerTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGCProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/Access.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/HeapAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/GCProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/MemoryProxy.java
- src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java
- src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/external/jquery/jquery.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
- src/jdk.javadoc/share/legal/jszip.md
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckControl.java
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckSupported.java
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckUnsupported.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java
- test/hotspot/jtreg/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java
- test/hotspot/jtreg/gc/g1/TestJNIWeakG1/libTestJNIWeakG1.c
! test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
- test/hotspot/jtreg/gc/shenandoah/compiler/TestCommonGCLoads.java
- test/hotspot/jtreg/gc/shenandoah/options/TestSafepointWorkers.java
- test/hotspot/jtreg/runtime/7116786/Test7116786.java
- test/hotspot/jtreg/runtime/7116786/testcases.jar
- test/hotspot/jtreg/runtime/7162488/Test7162488.sh
- test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java
- test/hotspot/jtreg/runtime/EnclosingMethodAttr/enclMethodAttr.jar
- test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVTT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/NotFoundLVTT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/testcase.jar
- test/hotspot/jtreg/runtime/StackGap/testme.sh
- test/hotspot/jtreg/runtime/StackGuardPages/testme.sh
- test/hotspot/jtreg/runtime/TLS/testtls.sh
- test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods.jar
- test/hotspot/jtreg/runtime/classFileParserBug/test.jar
- test/hotspot/jtreg/runtime/duplAttributes/test.jar
- test/hotspot/jtreg/runtime/records/TEST.properties
- test/hotspot/jtreg/runtime/testlibrary/GeneratedClassLoader.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/run.sh
- test/hotspot/jtreg/vmTestbase/jit/tiered/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/tiered/tieredTest.sh
- test/hotspot/jtreg/vmTestbase/metaspace/flags/maxMetaspaceSize/TestDescription.java
- test/hotspot/jtreg/vmTestbase/metaspace/flags/maxMetaspaceSize/maxMetaspaceSize.sh
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/run.sh
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/run.sh
- test/hotspot/jtreg/vmTestbase/vm/gc/kind/parOld/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/gc/kind/parOld/test.sh
- test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html
- test/jdk/java/io/Serializable/records/TEST.properties
- test/jdk/java/lang/instrument/TEST.properties
- test/jdk/java/lang/reflect/records/TEST.properties
- test/jdk/java/lang/runtime/TEST.properties
- test/jdk/java/net/httpclient/ssltest/bad.keystore
- test/jdk/java/net/httpclient/ssltest/good.keystore
- test/jdk/java/net/httpclient/ssltest/loopback.keystore
- test/jdk/jdk/jfr/api/consumer/recordingstream/TestSetFlushInterval.java
- test/jdk/jdk/jfr/api/recording/time/TestSetFlushInterval.java
- test/jdk/jdk/jfr/event/io/EvilInstrument.java
- test/jdk/jdk/jfr/event/sampling/libTestNative.c
- test/jdk/sun/management/jmxremote/bootstrap/Makefile
- test/jdk/sun/management/jmxremote/bootstrap/launcher.c
- test/jdk/sun/management/jmxremote/bootstrap/linux-amd64/launcher
- test/jdk/sun/management/jmxremote/bootstrap/linux-i586/launcher
- test/jdk/sun/management/jmxremote/bootstrap/solaris-amd64/launcher
- test/jdk/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher
- test/jdk/sun/security/krb5/auto/SaslGSS.java
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/TestExternalOverridenMethod.java
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/package-list
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/pkg/XReader.java
- test/langtools/jdk/javadoc/doclet/testOptions/help.html
- test/langtools/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java