src/hotspot/share/gc/g1/heapRegion.inline.hpp
changeset 47678 c84eeb55c55e
parent 47634 6a0c42c40cd1
child 47885 5caa1d5f74c1
equal deleted inserted replaced
47674:1587ffa1496a 47678:c84eeb55c55e
   175 
   175 
   176   if (block_is_obj(addr)) {
   176   if (block_is_obj(addr)) {
   177     return oop(addr)->size();
   177     return oop(addr)->size();
   178   }
   178   }
   179 
   179 
   180   return block_size_using_bitmap(addr, G1CollectedHeap::heap()->concurrent_mark()->prevMarkBitMap());
   180   return block_size_using_bitmap(addr, G1CollectedHeap::heap()->concurrent_mark()->prev_mark_bitmap());
   181 }
   181 }
   182 
   182 
   183 inline HeapWord* HeapRegion::par_allocate_no_bot_updates(size_t min_word_size,
   183 inline HeapWord* HeapRegion::par_allocate_no_bot_updates(size_t min_word_size,
   184                                                          size_t desired_word_size,
   184                                                          size_t desired_word_size,
   185                                                          size_t* actual_word_size) {
   185                                                          size_t* actual_word_size) {
   332     assert(start < next,
   332     assert(start < next,
   333            "start: " PTR_FORMAT ", next: " PTR_FORMAT, p2i(start), p2i(next));
   333            "start: " PTR_FORMAT ", next: " PTR_FORMAT, p2i(start), p2i(next));
   334   }
   334   }
   335 #endif
   335 #endif
   336 
   336 
   337   const G1CMBitMap* const bitmap = g1h->concurrent_mark()->prevMarkBitMap();
   337   const G1CMBitMap* const bitmap = g1h->concurrent_mark()->prev_mark_bitmap();
   338   do {
   338   do {
   339     oop obj = oop(cur);
   339     oop obj = oop(cur);
   340     assert(oopDesc::is_oop(obj, true), "Not an oop at " PTR_FORMAT, p2i(cur));
   340     assert(oopDesc::is_oop(obj, true), "Not an oop at " PTR_FORMAT, p2i(cur));
   341     assert(obj->klass_or_null() != NULL,
   341     assert(obj->klass_or_null() != NULL,
   342            "Unparsable heap at " PTR_FORMAT, p2i(cur));
   342            "Unparsable heap at " PTR_FORMAT, p2i(cur));