Mercurial > hg > graal-compiler
comparison src/share/vm/services/memSnapshot.hpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | b80cc96882f7 |
children | de6a9e811145 |
comparison
equal
deleted
inserted
replaced
10086:e0fb8a213650 | 10408:836a62f43af9 |
---|---|
306 assert(!(ret && FLAGS_TO_MEMORY_TYPE(p1->flags()) == mtThreadStack), "dup on stack record"); | 306 assert(!(ret && FLAGS_TO_MEMORY_TYPE(p1->flags()) == mtThreadStack), "dup on stack record"); |
307 return ret; | 307 return ret; |
308 } | 308 } |
309 }; | 309 }; |
310 | 310 |
311 class StagingArea : public _ValueObj { | 311 class StagingArea VALUE_OBJ_CLASS_SPEC { |
312 private: | 312 private: |
313 MemPointerArray* _malloc_data; | 313 MemPointerArray* _malloc_data; |
314 MemPointerArray* _vm_data; | 314 MemPointerArray* _vm_data; |
315 | 315 |
316 public: | 316 public: |