Mercurial > hg > truffle
diff src/share/vm/memory/metaspace.cpp @ 12302:9361de86a50f
8025059: Metspace::should_expand mixes bytes and words in check against MaxMetaspaceSize
Reviewed-by: coleenp, brutisso, mgerdin, jmasa
author | stefank |
---|---|
date | Fri, 20 Sep 2013 11:00:38 +0200 |
parents | 8c5e6482cbfc |
children | b960c9df4f11 |
line wrap: on
line diff
--- 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; }