hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Mar 5 22:06:05 UTC 2020


Changeset: d9a9c5180e58
Author:    mcimadamore
Date:      2020-03-05 22:05 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/d9a9c5180e58

Automatic merge with default

- make/Help.gmk
- make/autoconf/basics.m4
- make/autoconf/basics_windows.m4
- src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java
- src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
- src/jdk.internal.vm.compiler/.mx.graal/.project
- src/jdk.internal.vm.compiler/.mx.graal/.pydevproject
- src/jdk.internal.vm.compiler/.mx.graal/eclipse-settings/org.eclipse.jdt.core.prefs
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal.py
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal_9.py
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal_bench.py
- src/jdk.internal.vm.compiler/.mx.graal/outputparser.py
- src/jdk.internal.vm.compiler/.mx.graal/sanitycheck.py
- src/jdk.internal.vm.compiler/.mx.graal/suite.py
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MacroAssemblerTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGCProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/Access.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/HeapAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/GCProvider.java
- test/hotspot/jtreg/gc/shenandoah/compiler/TestCommonGCLoads.java
- test/hotspot/jtreg/gc/shenandoah/options/TestSafepointWorkers.java
- test/hotspot/jtreg/runtime/7116786/Test7116786.java
- test/hotspot/jtreg/runtime/7116786/testcases.jar
- test/hotspot/jtreg/runtime/EnclosingMethodAttr/enclMethodAttr.jar
- test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVTT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/NotFoundLVTT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/testcase.jar
- test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods.jar
- test/hotspot/jtreg/runtime/classFileParserBug/test.jar
- test/hotspot/jtreg/runtime/duplAttributes/test.jar
- test/hotspot/jtreg/runtime/testlibrary/GeneratedClassLoader.java
- test/hotspot/jtreg/vmTestbase/vm/gc/kind/parOld/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/gc/kind/parOld/test.sh
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/TestExternalOverridenMethod.java
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/package-list
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/pkg/XReader.java



More information about the amber-dev mailing list