diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-03-12 16:56:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-12 16:56:20 +0000 |
| commit | 3848c4fbc189287bca1298d45d07e21ec90c7c82 (patch) | |
| tree | 489c7d240326f097a7ae8b1ee26fb919f2cae120 /runtime | |
| parent | 02ae5094ac778e2cd0040c16871672367fc2389c (diff) | |
| parent | d04495edc261bf7fbdb7c6a1c31c6dda08e990ed (diff) | |
| download | android_art-3848c4fbc189287bca1298d45d07e21ec90c7c82.tar.gz android_art-3848c4fbc189287bca1298d45d07e21ec90c7c82.tar.bz2 android_art-3848c4fbc189287bca1298d45d07e21ec90c7c82.zip | |
Merge "Fix CC collector boot."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/gc/heap.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index a41d65ce4a..c421262ef5 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -2064,8 +2064,6 @@ void Heap::PreZygoteFork() { non_moving_space_->GetMemMap()->Protect(PROT_READ | PROT_WRITE); const bool same_space = non_moving_space_ == main_space_; if (kCompactZygote) { - // Can't compact if the non moving space is the same as the main space. - DCHECK(semi_space_collector_ != nullptr); // Temporarily disable rosalloc verification because the zygote // compaction will mess up the rosalloc internal metadata. ScopedDisableRosAllocVerification disable_rosalloc_verif(this); @@ -2084,6 +2082,8 @@ void Heap::PreZygoteFork() { } } else { CHECK(main_space_ != nullptr); + CHECK_NE(main_space_, non_moving_space_) + << "Does not make sense to compact within the same space"; // Copy from the main space. zygote_collector.SetFromSpace(main_space_); reset_main_space = true; |