hg: jdk/sandbox: Merge

[ashipile at redhat.com]

Changeset: a846e7bbcdfa
Author:    shade
Date:      2018-06-11 09:29 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/a846e7bbcdfa

Merge

! src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
! src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
! src/hotspot/cpu/s390/templateTable_s390.cpp
- src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.inline.hpp
- src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.inline.hpp
- src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.inline.hpp
- src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.inline.hpp
- src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp
- src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.inline.hpp
- src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.inline.hpp
- src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.inline.hpp
- src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.inline.hpp
- src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.inline.hpp
- src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.inline.hpp
- src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.inline.hpp
- src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
! src/hotspot/share/precompiled/precompiled.hpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/arguments.hpp
! src/hotspot/share/runtime/globals.hpp
- src/hotspot/share/runtime/orderAccess.inline.hpp
! src/hotspot/share/services/memoryManager.cpp
- src/java.base/aix/native/libjsig/jsig.c
- src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h
- src/java.desktop/share/classes/sun/applet/AppletEvent.java
- src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java
- src/java.desktop/share/classes/sun/applet/AppletIOException.java
- src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java
- src/java.desktop/share/classes/sun/applet/AppletImageRef.java
- src/java.desktop/share/classes/sun/applet/AppletListener.java
- src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java
- src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java
- src/java.desktop/share/classes/sun/applet/AppletPanel.java
- src/java.desktop/share/classes/sun/applet/AppletProps.java
- src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java
- src/java.desktop/share/classes/sun/applet/AppletSecurityException.java
- src/java.desktop/share/classes/sun/applet/AppletViewer.java
- src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java
- src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
- src/java.desktop/share/classes/sun/applet/Main.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
- src/java.desktop/share/classes/sun/print/DialogOnTop.java
- src/java.desktop/share/classes/sun/print/DialogOwner.java
- src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
- src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/MissingRequiredOptionException.java
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/UnacceptableNumberOfNonOptionsException.java
- src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/internal/Objects.java
! test/hotspot/jtreg/serviceability/sa/TestUniverse.java
- test/jdk/javax/swing/JLayer/8041982/cupanim.gif
- test/jdk/javax/swing/JSlider/4987336/cupanim.gif
- test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
- test/jdk/sun/applet/TEST.properties