# HG changeset patch
# User jmasa
# Date 1377018158 25200
# Node ID 31f220c1f78914a63f079a12d047ccefb8480bb2
# Parent  57600c4aeabeaf8cd5f484f10bbbe82516f8b01f# Parent  4229207309032ef7b50d05963bec45817c354274
Merge

diff -r 57600c4aeabe -r 31f220c1f789 src/share/vm/oops/klass.hpp
--- a/src/share/vm/oops/klass.hpp	Mon Aug 19 08:58:56 2013 -0700
+++ b/src/share/vm/oops/klass.hpp	Tue Aug 20 10:02:38 2013 -0700
@@ -352,7 +352,8 @@
   static int layout_helper_log2_element_size(jint lh) {
     assert(lh < (jint)_lh_neutral_value, "must be array");
     int l2esz = (lh >> _lh_log2_element_size_shift) & _lh_log2_element_size_mask;
-    assert(l2esz <= LogBitsPerLong, "sanity");
+    assert(l2esz <= LogBitsPerLong,
+        err_msg("sanity. l2esz: 0x%x for lh: 0x%x", (uint)l2esz, (uint)lh));
     return l2esz;
   }
   static jint array_layout_helper(jint tag, int hsize, BasicType etype, int log2_esize) {
diff -r 57600c4aeabe -r 31f220c1f789 src/share/vm/services/memoryPool.cpp
--- a/src/share/vm/services/memoryPool.cpp	Mon Aug 19 08:58:56 2013 -0700
+++ b/src/share/vm/services/memoryPool.cpp	Tue Aug 20 10:02:38 2013 -0700
@@ -268,11 +268,11 @@
 }
 
 size_t MetaspacePool::used_in_bytes() {
-  return MetaspaceAux::allocated_used_bytes(Metaspace::NonClassType);
+  return MetaspaceAux::allocated_used_bytes();
 }
 
 size_t MetaspacePool::capacity_in_bytes() const {
-  return MetaspaceAux::allocated_capacity_bytes(Metaspace::NonClassType);
+  return MetaspaceAux::allocated_capacity_bytes();
 }
 
 size_t MetaspacePool::calculate_max_size() const {