hg: amber/amber: Automatic merge with sealed-types
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Thu Feb 13 22:08:27 UTC 2020
Changeset: 4057f45b992a
Author: mcimadamore
Date: 2020-02-13 22:08 +0000
URL: https://hg.openjdk.java.net/amber/amber/rev/4057f45b992a
Automatic merge with sealed-types
! .hgtags
- make/CopyInterimCLDRConverter.gmk
! make/Main.gmk
! make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
! src/hotspot/cpu/aarch64/aarch64.ad
! 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/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/windows/os_windows.cpp
! src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
! src/hotspot/share/c1/c1_GraphBuilder.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classFileParser.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.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/parallel/psCompactionManager.hpp
! src/hotspot/share/gc/parallel/psParallelCompact.cpp
! src/hotspot/share/gc/parallel/psPromotionManager.cpp
! src/hotspot/share/gc/parallel/psPromotionManager.hpp
! src/hotspot/share/gc/parallel/psYoungGen.cpp
! src/hotspot/share/gc/shared/generation.cpp
! 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/include/cds.h
! 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/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/opto/c2_globals.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/loopopts.cpp
! src/hotspot/share/opto/node.cpp
! src/hotspot/share/prims/whitebox.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/deoptimization.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/mutex.hpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/vmOperations.cpp
! src/hotspot/share/runtime/vmStructs.cpp
! 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/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/reflect/Method.java
! src/java.base/share/classes/java/util/regex/Pattern.java
! src/java.base/share/classes/module-info.java
! src/java.base/share/conf/security/java.security
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.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/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/doclets/toolkit/BaseConfiguration.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.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/CommentHelper.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
- src/jdk.javadoc/share/legal/jszip.md
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/TEST.groups
- test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java
! test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java
! test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java
! test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DifferentHeapSizes.java
! test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
! test/jdk/ProblemList.txt
- 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/langtools/tools/javac/records/RecordCompilationTests.java
More information about the amber-dev
mailing list