hg: panama/dev: Automatic merge with foreign

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Sep 25 22:10:42 UTC 2019


Changeset: f332e21fee1b
Author:    mcimadamore
Date:      2019-09-25 22:10 +0000
URL:       https://hg.openjdk.java.net/panama/dev/rev/f332e21fee1b

Automatic merge with foreign

! src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
! src/hotspot/cpu/sparc/sharedRuntime_sparc.cpp
! src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
! src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
- src/hotspot/os/linux/gc/z/zVirtualMemory_linux.cpp
! src/hotspot/share/c1/c1_GraphBuilder.cpp
! src/hotspot/share/ci/ciObjectFactory.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/code/compiledMethod.cpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/type.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/sharedRuntime.cpp
! src/hotspot/share/runtime/thread.hpp
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
- src/java.base/share/native/libjava/ObjectInputStream.c
- src/java.base/share/native/libjava/ObjectOutputStream.c
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/PolymorphicInliningTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotClassInitializationPlugin.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NormalizeCompareNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/JLModule.java
- src/jdk.jcmd/linux/classes/sun/tools/ProcessHelper.java
- test/jdk/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java



More information about the panama-dev mailing list