comparison src/share/vm/memory/threadLocalAllocBuffer.inline.hpp @ 1579:e9ff18c4ace7

Merge
author jrose
date Wed, 02 Jun 2010 22:45:42 -0700
parents c18cbe5936b8 2d127394260e
children f95d63e2154a
comparison
equal deleted inserted replaced
1562:dfe27f03244a 1579:e9ff18c4ace7
29 // successful thread-local allocation 29 // successful thread-local allocation
30 #ifdef ASSERT 30 #ifdef ASSERT
31 // Skip mangling the space corresponding to the object header to 31 // Skip mangling the space corresponding to the object header to
32 // ensure that the returned space is not considered parsable by 32 // ensure that the returned space is not considered parsable by
33 // any concurrent GC thread. 33 // any concurrent GC thread.
34 size_t hdr_size = CollectedHeap::min_fill_size(); 34 size_t hdr_size = oopDesc::header_size();
35 Copy::fill_to_words(obj + hdr_size, size - hdr_size, badHeapWordVal); 35 Copy::fill_to_words(obj + hdr_size, size - hdr_size, badHeapWordVal);
36 #endif // ASSERT 36 #endif // ASSERT
37 // This addition is safe because we know that top is 37 // This addition is safe because we know that top is
38 // at least size below end, so the add can't wrap. 38 // at least size below end, so the add can't wrap.
39 set_top(obj + size); 39 set_top(obj + size);