hg: jdk9/sandbox/hotspot: Merge

[aleksey.shipilev at oracle.com]

Changeset: f169f99bf660
Author:    shade
Date:      2016-03-10 01:40 +0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/f169f99bf660

Merge

! src/cpu/aarch64/vm/aarch64.ad
! src/cpu/aarch64/vm/globals_aarch64.hpp
! src/cpu/ppc/vm/globals_ppc.hpp
! src/cpu/ppc/vm/ppc.ad
! src/cpu/sparc/vm/globals_sparc.hpp
! src/cpu/sparc/vm/sparc.ad
! src/cpu/x86/vm/globals_x86.hpp
! src/cpu/x86/vm/x86_32.ad
! src/cpu/x86/vm/x86_64.ad
! src/cpu/zero/vm/globals_zero.hpp
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/development/Server16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/development/Server24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/About16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/About24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Delete16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Delete24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Find16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Help16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Help24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/History16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/History24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Information16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Information24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/New16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/New24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Open16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Open24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Save24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/SaveAs16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/SaveAs24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Zoom16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/ZoomIn16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/ZoomIn24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/navigation/Down16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/navigation/Up16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignCenter16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignCenter24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignLeft16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignLeft24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignRight16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignRight24.gif
! src/share/vm/adlc/formssel.cpp
! src/share/vm/c1/c1_Compiler.cpp
! src/share/vm/c1/c1_LIRGenerator.cpp
! src/share/vm/c1/c1_LIRGenerator.hpp
! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/classfile/vmSymbols.cpp
! src/share/vm/classfile/vmSymbols.hpp
- src/share/vm/gc/g1/concurrentMark.cpp
- src/share/vm/gc/g1/concurrentMark.hpp
- src/share/vm/gc/g1/concurrentMark.inline.hpp
! src/share/vm/interpreter/linkResolver.cpp
- src/share/vm/jvmci/commandLineFlagConstraintsJVMCI.cpp
- src/share/vm/jvmci/commandLineFlagConstraintsJVMCI.hpp
! src/share/vm/oops/method.cpp
! src/share/vm/opto/c2compiler.cpp
! src/share/vm/opto/classes.hpp
! src/share/vm/opto/compile.cpp
! src/share/vm/opto/escape.cpp
! src/share/vm/opto/library_call.cpp
! src/share/vm/opto/loopTransform.cpp
! src/share/vm/opto/matcher.cpp
! src/share/vm/opto/memnode.hpp
! src/share/vm/opto/node.hpp
! src/share/vm/prims/methodHandles.cpp
! src/share/vm/prims/methodHandles.hpp
! src/share/vm/prims/unsafe.cpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/vmStructs.cpp
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java
! test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestBoolean.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestDouble.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestFloat.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestObject.java
! test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java
! test/compiler/unsafe/X-UnsafeAccessTest.java.template
! test/compiler/unsafe/generate-unsafe-tests.sh