summaryrefslogtreecommitdiffstats
path: root/runtime/gc/collector/garbage_collector.cc
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2014-04-09 14:51:05 -0700
committerMathieu Chartier <mathieuc@google.com>2014-04-14 10:07:47 -0700
commita8e8f9c0a8e259a807d7b99a148d14104c24209d (patch)
treed8ed041dd3cf490163f6b405102ea36d3b4b0828 /runtime/gc/collector/garbage_collector.cc
parent043a7a6182870964021476484b1534106ff20600 (diff)
downloadart-a8e8f9c0a8e259a807d7b99a148d14104c24209d.zip
art-a8e8f9c0a8e259a807d7b99a148d14104c24209d.tar.gz
art-a8e8f9c0a8e259a807d7b99a148d14104c24209d.tar.bz2
Refactor space bitmap to support different alignments.
Required for: Using space bitmaps instead of std::set in mod union table + remembered set. Using a bitmap instead of set for large object marking. Bug: 13571028 Change-Id: Id024e9563d4ca4278f79607cdb2f81895121b113
Diffstat (limited to 'runtime/gc/collector/garbage_collector.cc')
-rw-r--r--runtime/gc/collector/garbage_collector.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/collector/garbage_collector.cc b/runtime/gc/collector/garbage_collector.cc
index a700c73..d99136a 100644
--- a/runtime/gc/collector/garbage_collector.cc
+++ b/runtime/gc/collector/garbage_collector.cc
@@ -174,8 +174,8 @@ void GarbageCollector::SwapBitmaps() {
if (space->GetGcRetentionPolicy() == space::kGcRetentionPolicyAlwaysCollect ||
(gc_type == kGcTypeFull &&
space->GetGcRetentionPolicy() == space::kGcRetentionPolicyFullCollect)) {
- accounting::SpaceBitmap* live_bitmap = space->GetLiveBitmap();
- accounting::SpaceBitmap* mark_bitmap = space->GetMarkBitmap();
+ accounting::ContinuousSpaceBitmap* live_bitmap = space->GetLiveBitmap();
+ accounting::ContinuousSpaceBitmap* mark_bitmap = space->GetMarkBitmap();
if (live_bitmap != nullptr && live_bitmap != mark_bitmap) {
heap_->GetLiveBitmap()->ReplaceBitmap(live_bitmap, mark_bitmap);
heap_->GetMarkBitmap()->ReplaceBitmap(mark_bitmap, live_bitmap);