hg: amber/amber: Automatic merge with sealed-types

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Fri Mar 13 16:08:30 UTC 2020


Changeset: 7347cc51c794
Author:    mcimadamore
Date:      2020-03-13 16:08 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/7347cc51c794

Automatic merge with sealed-types

! .hgtags
! make/autoconf/flags-cflags.m4
- make/jdk/src/classes/build/tools/intpoly/header.txt
! src/hotspot/cpu/aarch64/aarch64.ad
! src/hotspot/cpu/arm/macroAssembler_arm.cpp
! src/hotspot/cpu/x86/assembler_x86.cpp
! src/hotspot/cpu/x86/assembler_x86.hpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/cpu/x86/x86_64.ad
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/compiler/compileBroker.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp
! src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp
! src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
! src/hotspot/share/gc/g1/g1Policy.cpp
! src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
! 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/shenandoah/c2/shenandoahSupport.cpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
- src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.cpp
- src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp
! src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
! src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
! 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/shenandoahStringDedup.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp
! src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
! src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
! src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
! src/hotspot/share/gc/z/zCollectedHeap.cpp
! src/hotspot/share/gc/z/zCollectedHeap.hpp
! src/hotspot/share/gc/z/zDriver.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/heapInspection.cpp
! src/hotspot/share/memory/metaspaceShared.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/loopnode.cpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/nativeLookup.cpp
! src/hotspot/share/prims/whitebox.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/mutexLocker.cpp
! src/hotspot/share/runtime/mutexLocker.hpp
! src/hotspot/share/runtime/os.cpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/vmOperations.hpp
- src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/net/NetworkInterface.java
! src/java.base/share/classes/module-info.java
- src/java.base/unix/classes/java/lang/ClassLoaderHelper.java
! src/java.base/unix/native/libnet/NetworkInterface.c
- src/java.base/windows/classes/java/lang/ClassLoaderHelper.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/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/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/markup/Navigation.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/TEST.groups
- test/hotspot/jtreg/compiler/escapeAnalysis/TestCopyOfBrokenAntiDependency.java
- 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/shenandoah/TestStringDedupStress.java
! test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java
! test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java
! test/jdk/ProblemList.txt
- test/langtools/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java
! test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV1.java



More information about the amber-dev mailing list