hg: amber/amber: Automatic merge with sealed-types
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Fri Apr 10 17:14:20 UTC 2020
Changeset: aa378a711d0d
Author: mcimadamore
Date: 2020-04-10 17:14 +0000
URL: https://hg.openjdk.java.net/amber/amber/rev/aa378a711d0d
Automatic merge with sealed-types
! .hgtags
! doc/building.html
- make/CompileInterimRmic.gmk
! make/Docs.gmk
! make/Main.gmk
! make/autoconf/flags-cflags.m4
! make/autoconf/spec.gmk.in
- make/common/RMICompilation.gmk
! make/hotspot/lib/CompileJvm.gmk
- make/jdk/src/classes/build/tools/util/Header.java
- 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/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/shenandoahBarrierSetAssembler_aarch64.cpp
! src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
! src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
! src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
! src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
! src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
! src/hotspot/cpu/arm/interp_masm_arm.cpp
! src/hotspot/cpu/arm/macroAssembler_arm.cpp
! src/hotspot/cpu/arm/sharedRuntime_arm.cpp
! src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
! src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
! src/hotspot/cpu/ppc/sharedRuntime_ppc.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/sparc/interp_masm_sparc.cpp
! src/hotspot/cpu/sparc/macroAssembler_sparc.cpp
! src/hotspot/cpu/sparc/sharedRuntime_sparc.cpp
! src/hotspot/cpu/x86/assembler_x86.cpp
! src/hotspot/cpu/x86/assembler_x86.hpp
! src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
! src/hotspot/cpu/x86/x86_64.ad
! src/hotspot/os/aix/os_aix.cpp
! src/hotspot/os/bsd/os_bsd.cpp
! src/hotspot/os/linux/os_linux.cpp
! src/hotspot/os/solaris/os_solaris.cpp
! src/hotspot/os/windows/os_windows.cpp
! src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
! src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
! src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
! src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
! src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
! src/hotspot/os_cpu/linux_sparc/os_linux_sparc.cpp
! src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
! src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
! src/hotspot/share/adlc/formssel.cpp
! src/hotspot/share/aot/aotCodeHeap.cpp
! src/hotspot/share/c1/c1_GraphBuilder.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classLoader.cpp
! src/hotspot/share/classfile/classLoader.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/compiler/compileBroker.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.cpp
! src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
! src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
! src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp
! src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
! src/hotspot/share/gc/g1/heapRegion.cpp
! src/hotspot/share/gc/g1/heapRegion.hpp
! src/hotspot/share/gc/shared/gc_globals.hpp
! src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
! 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/shenandoahTraversalAggressiveHeuristics.hpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp
! 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/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/shenandoahTraversalGC.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.hpp
! src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
! src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
! src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
! src/hotspot/share/gc/z/zMark.cpp
! src/hotspot/share/gc/z/zStat.cpp
! src/hotspot/share/interpreter/templateInterpreter.cpp
! src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.cpp
! src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
! src/hotspot/share/jvmci/jvmci.cpp
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/filemap.cpp
! src/hotspot/share/memory/filemap.hpp
! 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.hpp
! src/hotspot/share/opto/c2_globals.hpp
! src/hotspot/share/opto/c2compiler.cpp
! src/hotspot/share/opto/classes.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/loopnode.cpp
! src/hotspot/share/opto/macro.cpp
! src/hotspot/share/opto/memnode.cpp
! src/hotspot/share/opto/node.cpp
! src/hotspot/share/opto/node.hpp
! src/hotspot/share/opto/parse1.cpp
! src/hotspot/share/opto/runtime.cpp
! src/hotspot/share/opto/type.cpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/prims/whitebox.cpp
! src/hotspot/share/runtime/biasedLocking.cpp
! src/hotspot/share/runtime/flags/jvmFlag.cpp
! src/hotspot/share/runtime/handshake.cpp
! src/hotspot/share/runtime/interfaceSupport.inline.hpp
! src/hotspot/share/runtime/os.cpp
! src/hotspot/share/runtime/os.hpp
! src/hotspot/share/runtime/safepoint.cpp
! src/hotspot/share/runtime/synchronizer.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/utilities/globalDefinitions.hpp
! src/hotspot/share/utilities/vmError.cpp
- src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/Math.java
! src/java.base/share/classes/java/lang/StrictMath.java
! src/java.base/share/classes/java/lang/String.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/net/URL.java
! src/java.base/share/classes/java/net/URLStreamHandler.java
! src/java.base/share/classes/java/text/NumberFormat.java
! src/java.base/share/classes/java/util/Calendar.java
! src/java.base/share/classes/java/util/Collections.java
! src/java.base/share/classes/java/util/TreeMap.java
! src/java.base/share/classes/java/util/regex/Pattern.java
! src/java.base/share/classes/module-info.java
! src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
! src/java.base/share/classes/sun/security/x509/AlgorithmId.java
! src/java.base/share/classes/sun/util/calendar/ZoneInfo.java
! src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
! src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java
! src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
! src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
! src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
! src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
! src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
! src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java
! src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
! src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java
! src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java
! src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
! src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
- src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.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/processing/JavacProcessingEnvironment.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java
- src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/dumb-colors.caps
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.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/HotSpotReplacementsImpl.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.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.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/MemoryProxy.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOfDispatchNode.java
! src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.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/AnnotationTypeFieldWriterImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.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/markup/HtmlTag.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BasePropertyTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertyGetterTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertySetterTaglet.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
! test/hotspot/jtreg/ProblemList-aot.txt
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/gc/CriticalNativeArgs.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/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/gc/stress/gcold/TestGCOldWithShenandoah.java
! test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java
! test/hotspot/jtreg/resourcehogs/serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java
! test/hotspot/jtreg/resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java
! test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java
! test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal001/TEST.properties
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal001/steal001.java
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal002/TEST.properties
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal002/steal002.java
! test/jdk/ProblemList.txt
- test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html
! test/jdk/java/net/MulticastSocket/Promiscuous.java
- 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/tools/keytool/fakegen/DefaultSignatureAlgorithm.java
- test/jdk/sun/tools/jps/LingeredApp.java
! test/jtreg-ext/requires/VMProps.java
! test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
! test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.out
! test/langtools/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java
! test/langtools/tools/javac/launcher/SourceLauncherTest.java
More information about the amber-dev
mailing list