# HG changeset patch
# User stefank
# Date 1379667638 -7200
# Node ID 9361de86a50fdbbb92d15d95ed3922724a6097d3
# Parent  2c022e432e102a0b6a095a3f2b9b62f92f99153f
8025059: Metspace::should_expand mixes bytes and words in check against MaxMetaspaceSize
Reviewed-by: coleenp, brutisso, mgerdin, jmasa

diff -r 2c022e432e10 -r 9361de86a50f src/share/vm/memory/metaspace.cpp
--- a/src/share/vm/memory/metaspace.cpp	Fri Sep 20 10:53:28 2013 +0200
+++ b/src/share/vm/memory/metaspace.cpp	Fri Sep 20 11:00:38 2013 +0200
@@ -1342,8 +1342,9 @@
   // reserved space, because this is a larger space prereserved for compressed
   // class pointers.
   if (!FLAG_IS_DEFAULT(MaxMetaspaceSize)) {
-    size_t real_allocated = Metaspace::space_list()->reserved_words() +
-              MetaspaceAux::allocated_capacity_bytes(Metaspace::ClassType);
+    size_t nonclass_allocated = MetaspaceAux::reserved_bytes(Metaspace::NonClassType);
+    size_t class_allocated    = MetaspaceAux::allocated_capacity_bytes(Metaspace::ClassType);
+    size_t real_allocated     = nonclass_allocated + class_allocated;
     if (real_allocated >= MaxMetaspaceSize) {
       return false;
     }