OpenJDK / bsd-port / jdk9 / hotspot
changeset 5119:31f220c1f789
Merge
| author | jmasa |
|---|---|
| date | Tue, 20 Aug 2013 10:02:38 -0700 |
| parents | 57600c4aeabe 422920730903 |
| children | 61521bd65100 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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 {