hg: amber/amber: Automatic merge with sealed-types
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Mon Jan 27 12:16:03 UTC 2020
Changeset: 29d13e886b4f
Author: mcimadamore
Date: 2020-01-27 12:15 +0000
URL: https://hg.openjdk.java.net/amber/amber/rev/29d13e886b4f
Automatic merge with sealed-types
! .hgtags
! make/Main.gmk
! make/autoconf/flags-cflags.m4
! make/autoconf/spec.gmk.in
! src/hotspot/cpu/aarch64/aarch64.ad
! src/hotspot/cpu/aarch64/assembler_aarch64.hpp
! src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
! src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
! src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
! src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
! src/hotspot/cpu/aarch64/globals_aarch64.hpp
! src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
! src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
! src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
! src/hotspot/cpu/s390/interp_masm_s390.cpp
! src/hotspot/cpu/s390/macroAssembler_s390.cpp
! src/hotspot/cpu/s390/sharedRuntime_s390.cpp
! src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
! src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
! src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
! src/hotspot/cpu/zero/globals_zero.hpp
- 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/linux/gc/z/zMountPoint_linux.cpp
+ src/hotspot/os/linux/gc/z/zMountPoint_linux.hpp
! src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
! src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.hpp
! src/hotspot/os/posix/os_posix.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.hpp
! src/hotspot/share/aot/aotCodeHeap.cpp
! src/hotspot/share/c1/c1_Runtime1.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classLoader.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/code/nmethod.cpp
! src/hotspot/share/compiler/compileBroker.cpp
! src/hotspot/share/gc/epsilon/epsilonHeap.cpp
! src/hotspot/share/gc/epsilon/epsilonHeap.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
! src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
! src/hotspot/share/gc/g1/g1EvacFailure.cpp
! src/hotspot/share/gc/g1/g1FullCollector.cpp
! src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
! src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
! src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
! src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
! src/hotspot/share/gc/g1/g1RemSet.cpp
! src/hotspot/share/gc/g1/heapRegion.cpp
! src/hotspot/share/gc/g1/heapRegion.hpp
! src/hotspot/share/gc/parallel/parallelScavengeHeap.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/parallel/psParallelCompact.hpp
! src/hotspot/share/gc/parallel/psPromotionManager.cpp
! src/hotspot/share/gc/parallel/psPromotionManager.hpp
! src/hotspot/share/gc/parallel/psScavenge.cpp
! src/hotspot/share/gc/parallel/psYoungGen.cpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
! src/hotspot/share/gc/shared/gc_globals.hpp
! src/hotspot/share/gc/shared/genCollectedHeap.cpp
! src/hotspot/share/gc/shared/generation.cpp
! src/hotspot/share/gc/shared/memAllocator.cpp
! src/hotspot/share/gc/shared/memAllocator.hpp
! src/hotspot/share/gc/shared/preservedMarks.inline.hpp
! src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
! src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
! src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp
! src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp
! src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
! src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp
! src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
! src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
! src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
! src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
! src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
! src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
! src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
! src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp
! src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
! src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
! src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
! src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp
! src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
! src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.cpp
! src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
! src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
! src/hotspot/share/gc/z/zHeap.cpp
! src/hotspot/share/gc/z/zRootsIterator.cpp
! src/hotspot/share/gc/z/zStat.cpp
! src/hotspot/share/include/cds.h
! src/hotspot/share/interpreter/bytecodeInterpreter.cpp
! src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.cpp
! src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.cpp
! src/hotspot/share/jfr/leakprofiler/chains/edgeStore.cpp
! src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp
! src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/jvmci/jvmciRuntime.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/filemap.cpp
! src/hotspot/share/memory/filemap.hpp
! src/hotspot/share/memory/heapInspection.cpp
! src/hotspot/share/memory/heapInspection.hpp
! src/hotspot/share/memory/heapShared.cpp
! src/hotspot/share/memory/metaspaceShared.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/klass.hpp
! src/hotspot/share/oops/klassVtable.cpp
! src/hotspot/share/oops/markWord.hpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/oops/oopsHierarchy.hpp
! src/hotspot/share/oops/recordComponent.cpp
! src/hotspot/share/oops/recordComponent.hpp
! src/hotspot/share/opto/c2_globals.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/loopnode.cpp
! src/hotspot/share/opto/memnode.cpp
! src/hotspot/share/opto/memnode.hpp
! src/hotspot/share/opto/runtime.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiExport.cpp
! src/hotspot/share/prims/jvmtiTagMap.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/prims/whitebox.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/biasedLocking.cpp
! src/hotspot/share/runtime/flags/jvmFlag.cpp
! src/hotspot/share/runtime/flags/jvmFlagRangeList.cpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/handshake.cpp
! src/hotspot/share/runtime/mutexLocker.cpp
! src/hotspot/share/runtime/mutexLocker.hpp
! src/hotspot/share/runtime/os.cpp
! src/hotspot/share/runtime/safepoint.cpp
! src/hotspot/share/runtime/safepoint.hpp
! src/hotspot/share/runtime/serviceThread.cpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/vmOperations.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/hotspot/share/runtime/vmThread.cpp
! src/hotspot/share/services/attachListener.cpp
! src/hotspot/share/utilities/globalDefinitions.hpp
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/Record.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/annotation/ElementType.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/net/URL.java
! src/java.base/share/classes/java/security/CodeSource.java
- src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties
! src/java.base/share/classes/java/util/regex/Pattern.java
! src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
! src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
- 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/security/tools/keytool/Resources_ja.java
! src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
! src/java.base/share/classes/sun/security/x509/AlgorithmId.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/share/man/java.1
! src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.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/DeferredAttr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MatchBindingsComputer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.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/HtmlDoclet.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
! src/jdk.javadoc/share/man/javadoc.1
! src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
! test/hotspot/jtreg/ProblemList-aot.txt
! test/hotspot/jtreg/ProblemList-graal.txt
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/gc/CriticalNativeArgs.java
! test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
! test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java
! test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java
! test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java
! test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java
! test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java
! test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java
! test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java
! test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java
! test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java
! test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java
! test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java
! test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java
! test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java
! test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java
! test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java
! test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java
! test/hotspot/jtreg/gc/shenandoah/jni/TestPinnedGarbage.java
! test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java
! test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java
! test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java
! test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java
! test/hotspot/jtreg/gc/stress/CriticalNativeStress.java
! test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
! test/hotspot/jtreg/resourcehogs/serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java
! test/hotspot/jtreg/resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java
! test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java
! test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
! test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
- test/hotspot/jtreg/runtime/records/TEST.properties
- 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/util/Locale/LocaleProvidersRun.java
- test/jdk/jdk/jfr/api/consumer/recordingstream/TestSetFlushInterval.java
- test/jdk/jdk/jfr/api/recording/time/TestSetFlushInterval.java
! test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
! test/jdk/sun/security/krb5/auto/KDC.java
- test/jdk/sun/security/krb5/auto/SaslGSS.java
! test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
! test/langtools/lib/combo/tools/javac/combo/CompilationTestCase.java
! test/langtools/tools/javac/patterns/BindingsExistTest.out
! test/langtools/tools/javac/patterns/BindingsTest1.java
! test/langtools/tools/javac/patterns/DuplicateBindingTest.java
! test/langtools/tools/javac/patterns/DuplicateBindingTest.out
! test/langtools/tools/javac/patterns/MatchBindingScopeTest.out
! test/langtools/tools/javac/records/RecordCompilationTests.java
More information about the amber-dev
mailing list