diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-01-13 17:19:19 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-01-31 09:45:09 -0800 |
| commit | a1602f28c0e3127ad511712d4b08db89737ae901 (patch) | |
| tree | 44d7abfcaa57de85fd3c3c40d5bff3173cc60387 /runtime/gc/accounting | |
| parent | a0e4b01b6b1ef5c88e340e6b2c09f83e535777a1 (diff) | |
| download | art-a1602f28c0e3127ad511712d4b08db89737ae901.zip art-a1602f28c0e3127ad511712d4b08db89737ae901.tar.gz art-a1602f28c0e3127ad511712d4b08db89737ae901.tar.bz2 | |
Add zygote space as its own space type.
Helps prevent errors caused from doing invalid operations on the
old alloc space.
Removed some duplicated code in mark_sweep.cc and semi_space.cc.
Change-Id: I67a772cab30d698744c918aad581053f282a4a99
Diffstat (limited to 'runtime/gc/accounting')
| -rw-r--r-- | runtime/gc/accounting/space_bitmap.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/gc/accounting/space_bitmap.cc b/runtime/gc/accounting/space_bitmap.cc index 99800fc..b831843 100644 --- a/runtime/gc/accounting/space_bitmap.cc +++ b/runtime/gc/accounting/space_bitmap.cc @@ -128,9 +128,9 @@ void SpaceBitmap::Walk(SpaceBitmap::Callback* callback, void* arg) { // // The callback is not permitted to increase the max of either bitmap. void SpaceBitmap::SweepWalk(const SpaceBitmap& live_bitmap, - const SpaceBitmap& mark_bitmap, - uintptr_t sweep_begin, uintptr_t sweep_end, - SpaceBitmap::SweepCallback* callback, void* arg) { + const SpaceBitmap& mark_bitmap, + uintptr_t sweep_begin, uintptr_t sweep_end, + SpaceBitmap::SweepCallback* callback, void* arg) { CHECK(live_bitmap.bitmap_begin_ != NULL); CHECK(mark_bitmap.bitmap_begin_ != NULL); CHECK_EQ(live_bitmap.heap_begin_, mark_bitmap.heap_begin_); |