Merge
authorlana
Thu, 07 May 2015 20:51:12 -0700
changeset 30317 febd2373771c
parent 30098 a4b1c7d6317a (diff)
parent 30316 6c651fa22980 (current diff)
child 30318 8f085493151f
Merge
hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java
hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualSpace.java
hotspot/src/cpu/x86/vm/rtmLocking.cpp
hotspot/src/cpu/x86/vm/templateTable_x86_32.hpp
hotspot/src/cpu/x86/vm/templateTable_x86_64.hpp
hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp
hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp
hotspot/src/share/vm/memory/sharedHeap.cpp
hotspot/src/share/vm/memory/sharedHeap.hpp
hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp
hotspot/src/share/vm/oops/klassPS.hpp
hotspot/src/share/vm/oops/oop.pcgc.inline.hpp
hotspot/src/share/vm/oops/oop.psgc.inline.hpp
hotspot/src/share/vm/runtime/virtualspace.cpp
hotspot/src/share/vm/runtime/virtualspace.hpp
hotspot/test/sanity/WhiteBox.java
--- a/hotspot/.hgtags	Thu May 07 13:58:57 2015 +0000
+++ b/hotspot/.hgtags	Thu May 07 20:51:12 2015 -0700
@@ -465,3 +465,4 @@
 9c916db4bf3bc164a47b5a9cefe5ffd71e111f6a jdk9-b60
 715d2da5801c410746e92f08066d53bde1496286 jdk9-b61
 1eab877142cce6ca06e556e2ad0af688f993f00b jdk9-b62
+2ac9b6b36689b50d1562627067c92d51781b5684 jdk9-b63