1.1 --- a/src/share/vm/oops/cpCacheKlass.cpp Thu Aug 25 20:29:30 2011 -0700 1.2 +++ b/src/share/vm/oops/cpCacheKlass.cpp Fri Aug 26 08:52:22 2011 -0700 1.3 @@ -63,8 +63,10 @@ 1.4 // CollectedHeap::permanent_obj_allocate(klass, size, CHECK_NULL); 1.5 1.6 oop obj = CollectedHeap::permanent_obj_allocate_no_klass_install(klass, size, CHECK_NULL); 1.7 - NOT_PRODUCT(Universe::heap()->check_for_bad_heap_word_value((HeapWord*) obj, 1.8 - size)); 1.9 +#ifndef PRODUCT 1.10 + const size_t hs = oopDesc::header_size(); 1.11 + Universe::heap()->check_for_bad_heap_word_value(((HeapWord*) obj)+hs, size-hs); 1.12 +#endif 1.13 constantPoolCacheOop cache = (constantPoolCacheOop) obj; 1.14 assert(!UseConcMarkSweepGC || obj->klass_or_null() == NULL, 1.15 "klass should be NULL here when using CMS");