hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Thu Mar 28 21:05:55 UTC 2019
Changeset: 5a7bfdbcb1a5
Author: mcimadamore
Date: 2019-03-28 22:05 +0100
URL: http://hg.openjdk.java.net/amber/amber/rev/5a7bfdbcb1a5
Automatic merge with default
- src/hotspot/os_cpu/linux_x86/gc/z/zLargePages_linux_x86.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zNUMA_linux_x86.cpp
- src/hotspot/os_cpu/linux_x86/gc/z/zVirtualMemory_linux_x86.cpp
- src/hotspot/share/gc/z/zForwardingTableEntry.hpp
- src/hotspot/share/gc/z/zNMethodAllocator.cpp
- src/hotspot/share/gc/z/zNMethodAllocator.hpp
- src/hotspot/share/gc/z/zPageTableEntry.hpp
- src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c
- src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c
- src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-tibetan.cc
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.h
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-private.hh
- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf-private.hh
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/UnsafeAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationBailoutActionHelp.txt
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/UnsafeAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/NodeCostDumpUtil.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/UnsafeAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/UnsafeAccess.java
- src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c
- test/hotspot/gtest/gc/z/test_zForwardingTable.cpp
- test/hotspot/jtreg/runtime/RedefineObject/Agent.java
- test/hotspot/jtreg/runtime/RedefineObject/TestRedefineObject.java
- test/hotspot/jtreg/runtime/RedefineObject/WalkThroughInvoke.java
- test/hotspot/jtreg/runtime/RedefineTests/ModifyAnonymous.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineAddLambdaExpression.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineAnnotations.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineDeleteJmethod.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineDoubleDelete.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineFinalizer.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineInterfaceCall.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineInterfaceMethods.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineLeak.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefinePreviousVersions.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethods.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java
- test/hotspot/jtreg/runtime/RedefineTests/RedefineSubtractLambdaExpression.java
- test/hotspot/jtreg/runtime/RedefineTests/TestMultipleClasses.java
- test/hotspot/jtreg/runtime/RedefineTests/libRedefineDeleteJmethod.c
- test/hotspot/jtreg/runtime/RedefineTests/libRedefineDoubleDelete.c
- test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest
- test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-aarch64
- test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-ppc64le
- test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-s390x
- test/hotspot/jtreg/runtime/handshake/HandshakeWalkSuspendExitTest.java
- test/hotspot/jtreg/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java
- test/hotspot/jtreg/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c
- test/hotspot/jtreg/serviceability/jvmti/RetransformClassesZeroLength.java
- test/hotspot/jtreg/serviceability/jvmti/TestLambdaFormRetransformation.java
- test/hotspot/jtreg/serviceability/jvmti/TestRedefineWithUnresolvedClass.java
- test/hotspot/jtreg/serviceability/jvmti/UnresolvedClassAgent.java
- test/hotspot/jtreg/serviceability/jvmti/UnresolvedClassAgent.mf
- test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html
- test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.html
- test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html
- test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.html
- test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html
- test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html
- test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html
- test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html
- test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.html
- test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html
- test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.html
- test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html
- test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.html
- test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html
- test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html
- test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html
- test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html
- test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html
- test/jdk/java/awt/FontClass/CreateFont/bigfont.html
- test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.html
- test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html
- test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html
- test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.html
- test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html
- test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html
- test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html
- test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html
- test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html
- test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html
- test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.html
- test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html
- test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html
- test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html
- test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.html
- test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html
- test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html
- test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html
- test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html
- test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html
- test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html
- test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html
- test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html
- test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html
- test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html
- test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html
- test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html
- test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html
- test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html
- test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html
- test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html
- test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html
- test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html
- test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html
- test/jdk/javax/imageio/AppletResourceTest.html
- test/jdk/javax/swing/JFrame/4962534/bug4962534.html
- test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.html
- test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.html
- test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.html
- test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest
- test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-aarch64
- test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-ppc64le
- test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-s390x
- test/jdk/sanity/client/TEST.ROOT.template
- test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html
- test/jdk/vm/JniInvocationTest.java
- test/jdk/vm/exeJniInvocationTest.c
- test/jdk/vm/gc/ArraySize.java
- test/jdk/vm/gc/InfiniteList.java
- test/jdk/vm/jit/BadLogicCode.java
- test/jdk/vm/jit/ExceptionInInit.java
- test/jdk/vm/jit/JITClassInit.java
- test/jdk/vm/runtime/ExplicitArithmeticCheck.java
- test/jdk/vm/runtime/MonitorCacheMaybeExpand_DeadLock.java
- test/jdk/vm/runtime/ReflectStackOverflow.java
- test/jdk/vm/runtime/ShiftTest.java
- test/jdk/vm/runtime/WideStrictInline.java
- test/jdk/vm/verifier/TestStaticIF.java
- test/jdk/vm/verifier/VerifyProtectedConstructor.java
- test/jdk/vm/verifier/VerifyStackForExceptionHandlers.java
- test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTests.java
- test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java
More information about the amber-dev
mailing list