hg: panama/dev: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Sep 19 20:07:25 UTC 2018


Changeset: a6fd68a623c8
Author:    mcimadamore
Date:      2018-09-19 22:09 +0200
URL:       http://hg.openjdk.java.net/panama/dev/rev/a6fd68a623c8

Automatic merge with default

- make/jdk/src/classes/build/tools/hasher/Hasher.java
- make/jdk/src/classes/build/tools/jarreorder/JarReorder.java
- make/mapfiles/libjsound/mapfile-vers
- make/mapfiles/libjvm_db/mapfile-vers
- make/mapfiles/libjvm_dtrace/mapfile-vers
! src/hotspot/cpu/arm/methodHandles_arm.cpp
! src/hotspot/cpu/arm/sharedRuntime_arm.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/opto/macro.cpp
! src/hotspot/share/opto/macro.hpp
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- src/java.base/windows/conf/tzmappings
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewArrayStub.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewInstanceStub.java
- test/jdk/java/util/ServiceLoader/basic/basic.sh
- test/jdk/lib/testlibrary/jdk/testlibrary/Utils.java



More information about the panama-dev mailing list