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

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Jan 30 22:07:58 UTC 2020


Changeset: afd8bd2a2890
Author:    mcimadamore
Date:      2020-01-30 22:07 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/afd8bd2a2890

Automatic merge with sealed-types

! .hgtags
! make/RunTests.gmk
! src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
! src/hotspot/cpu/aarch64/macroAssembler_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/arm/templateTable_arm.cpp
! src/hotspot/cpu/x86/assembler_x86.cpp
! src/hotspot/cpu/x86/assembler_x86.hpp
! src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/cpu/x86/x86_64.ad
! src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp
! src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
! src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.hpp
! src/hotspot/os/linux/os_linux.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/parallel/psCompactionManager.hpp
! src/hotspot/share/gc/shared/taskqueue.inline.hpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
! src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
! src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
! src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/mutexLocker.cpp
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.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/external/jquery/jquery.js
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.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/Utils.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
! test/hotspot/jtreg/ProblemList.txt
- 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/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/jdk/ProblemList.txt
- test/jdk/jdk/jfr/event/io/EvilInstrument.java
- test/jdk/jdk/jfr/event/sampling/libTestNative.c
- test/langtools/jdk/javadoc/doclet/testOptions/help.html
! test/langtools/tools/javac/annotations/typeAnnotations/classfile/Patterns.java
! test/langtools/tools/javac/patterns/LocalVariableTable.java
! test/langtools/tools/javac/records/RecordCompilationTests.java



More information about the amber-dev mailing list