Mercurial > hg > truffle
diff src/share/vm/oops/cpCacheKlass.cpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sat, 17 Dec 2011 21:40:27 +0100 |
| parents | baf763f388e6 |
| children |
line wrap: on
line diff
--- a/src/share/vm/oops/cpCacheKlass.cpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/oops/cpCacheKlass.cpp Sat Dec 17 21:40:27 2011 +0100 @@ -63,8 +63,10 @@ // CollectedHeap::permanent_obj_allocate(klass, size, CHECK_NULL); oop obj = CollectedHeap::permanent_obj_allocate_no_klass_install(klass, size, CHECK_NULL); - NOT_PRODUCT(Universe::heap()->check_for_bad_heap_word_value((HeapWord*) obj, - size)); +#ifndef PRODUCT + const size_t hs = oopDesc::header_size(); + Universe::heap()->check_for_bad_heap_word_value(((HeapWord*) obj)+hs, size-hs); +#endif constantPoolCacheOop cache = (constantPoolCacheOop) obj; assert(!UseConcMarkSweepGC || obj->klass_or_null() == NULL, "klass should be NULL here when using CMS");