Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/concurrentMark.cpp @ 20335:eec72fa4b108
8040722: G1: Clean up usages of heap_region_containing
Reviewed-by: tschatzl, jmasa
author | brutisso |
---|---|
date | Tue, 19 Aug 2014 12:39:06 +0200 |
parents | bfba6779654b |
children | 6701abbc4441 |
comparison
equal
deleted
inserted
replaced
20334:ff3169f25621 | 20335:eec72fa4b108 |
---|---|
2798 str = ""; | 2798 str = ""; |
2799 } else if (!_g1h->is_in_g1_reserved(obj)) { | 2799 } else if (!_g1h->is_in_g1_reserved(obj)) { |
2800 str = " O"; | 2800 str = " O"; |
2801 } else { | 2801 } else { |
2802 HeapRegion* hr = _g1h->heap_region_containing(obj); | 2802 HeapRegion* hr = _g1h->heap_region_containing(obj); |
2803 guarantee(hr != NULL, "invariant"); | |
2804 bool over_tams = _g1h->allocated_since_marking(obj, hr, _vo); | 2803 bool over_tams = _g1h->allocated_since_marking(obj, hr, _vo); |
2805 bool marked = _g1h->is_marked(obj, _vo); | 2804 bool marked = _g1h->is_marked(obj, _vo); |
2806 | 2805 |
2807 if (over_tams) { | 2806 if (over_tams) { |
2808 str = " >"; | 2807 str = " >"; |
3563 assert(_ref_processor != NULL, "should not be NULL"); | 3562 assert(_ref_processor != NULL, "should not be NULL"); |
3564 } | 3563 } |
3565 } | 3564 } |
3566 | 3565 |
3567 void CMTask::setup_for_region(HeapRegion* hr) { | 3566 void CMTask::setup_for_region(HeapRegion* hr) { |
3568 // Separated the asserts so that we know which one fires. | |
3569 assert(hr != NULL, | 3567 assert(hr != NULL, |
3570 "claim_region() should have filtered out continues humongous regions"); | 3568 "claim_region() should have filtered out NULL regions"); |
3571 assert(!hr->continuesHumongous(), | 3569 assert(!hr->continuesHumongous(), |
3572 "claim_region() should have filtered out continues humongous regions"); | 3570 "claim_region() should have filtered out continues humongous regions"); |
3573 | 3571 |
3574 if (_cm->verbose_low()) { | 3572 if (_cm->verbose_low()) { |
3575 gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT, | 3573 gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT, |