hg: jdk9/sandbox/hotspot: Merge

[tobias.hartmann at oracle.com]

Changeset: 43f5101b2ea5
Author:    thartmann
Date:      2015-05-06 10:55 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/43f5101b2ea5

Merge

- agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java
- agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualSpace.java
! src/cpu/sparc/vm/macroAssembler_sparc.cpp
! src/cpu/x86/vm/assembler_x86.cpp
! src/cpu/x86/vm/assembler_x86.hpp
! src/cpu/x86/vm/macroAssembler_x86.cpp
- src/cpu/x86/vm/rtmLocking.cpp
- src/cpu/x86/vm/templateTable_x86_32.hpp
- src/cpu/x86/vm/templateTable_x86_64.hpp
! src/cpu/x86/vm/x86_32.ad
! src/cpu/x86/vm/x86_64.ad
! src/share/vm/adlc/formssel.cpp
! src/share/vm/classfile/javaClasses.cpp
! src/share/vm/classfile/javaClasses.hpp
! src/share/vm/classfile/vmSymbols.hpp
! src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
! src/share/vm/gc_implementation/g1/g1StringDedupTable.hpp
- src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
- src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp
- src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp
- src/share/vm/memory/sharedHeap.cpp
- src/share/vm/memory/sharedHeap.hpp
- src/share/vm/oops/instanceClassLoaderKlass.cpp
- src/share/vm/oops/klassPS.hpp
- src/share/vm/oops/oop.pcgc.inline.hpp
- src/share/vm/oops/oop.psgc.inline.hpp
! src/share/vm/opto/c2_globals.hpp
! src/share/vm/opto/classes.hpp
! src/share/vm/opto/graphKit.cpp
! src/share/vm/opto/graphKit.hpp
! src/share/vm/opto/library_call.cpp
! src/share/vm/opto/loopopts.cpp
! src/share/vm/opto/macro.cpp
! src/share/vm/opto/matcher.cpp
! src/share/vm/opto/memnode.cpp
! src/share/vm/prims/jni.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/thread.cpp
- src/share/vm/runtime/virtualspace.cpp
- src/share/vm/runtime/virtualspace.hpp
- test/sanity/WhiteBox.java