Mercurial > hg > truffle
diff src/share/vm/memory/allocation.hpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 989155e2d07a 4102b59539ce |
children | b8f261ba79c6 |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp Tue Mar 05 21:58:51 2013 +0100 +++ b/src/share/vm/memory/allocation.hpp Tue Mar 05 23:44:54 2013 +0100 @@ -148,9 +148,10 @@ mtChunk = 0x0B00, // chunk that holds content of arenas mtJavaHeap = 0x0C00, // Java heap mtClassShared = 0x0D00, // class data sharing - mt_number_of_types = 0x000D, // number of memory types (mtDontTrack + mtTest = 0x0E00, // Test type for verifying NMT + mt_number_of_types = 0x000E, // number of memory types (mtDontTrack // is not included as validate type) - mtDontTrack = 0x0E00, // memory we do not or cannot track + mtDontTrack = 0x0F00, // memory we do not or cannot track mt_masks = 0x7F00, // object type mask