hg: panama/dev: manual merge with foreign

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Tue Dec 17 11:17:25 UTC 2019


Changeset: 8e44094c781c
Author:    mcimadamore
Date:      2019-12-17 11:13 +0000
URL:       https://hg.openjdk.java.net/panama/dev/rev/8e44094c781c

manual merge with foreign

! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
! src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/code/compiledMethod.cpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/opto/runtime.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/sharedRuntime.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/MethodType.java
- src/java.desktop/share/legal/opengl.md
- src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
- src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystemProvider.java
- test/jdk/java/awt/Color/AlphaColorTest.java
- test/jdk/java/awt/Color/GetMinMaxValue_ICC_ColorSpace.java
- test/jdk/java/awt/Color/HeadlessColor.java
- test/jdk/java/awt/Color/LoadProfileWithSM.java
- test/jdk/java/awt/Color/LoadStandardProfilesTest.java
- test/jdk/java/awt/Color/OpacityChange/OpacityChange.java
- test/jdk/java/awt/Color/XRenderTranslucentColorDrawTest.java
- test/jdk/java/nio/channels/DatagramChannel/AddressesAfterDisconnect.java
- test/jdk/javax/swing/JEditorPane/8226513/JEditorPaneLayoutTest.java
- test/jdk/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java
- test/jdk/jdk/jfr/api/consumer/streaming/TestRepositoryMigration.java
- test/jdk/jdk/modules/etc/src/TestJson.java
- test/jdk/jdk/modules/etc/src/TestRootModules.java
- test/jdk/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java
- test/jdk/sun/security/tools/keytool/DeprecateKeyalg.java
- test/langtools/jdk/javadoc/doclet/testDocFiles/pkg/Test.java
- test/langtools/jdk/javadoc/doclet/testDocFiles/pkg/doc-files/test.txt



More information about the panama-dev mailing list