summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hiroshi Yamauchi <yamauchi@google.com> 2013-11-13 18:40:52 -0800
committer Hiroshi Yamauchi <yamauchi@google.com> 2013-11-13 18:44:16 -0800
commit5ceb974adf4720f67b7157ad754aceefd0f20ecc (patch)
tree331f95627376e91016e150c4daf7ab9670e0fcf1
parentdfcca560e7b92e055a02adb39fdfb11798144cdd (diff)
Fix libart.do boot check failure (b/11679102).
The zygote space's limit should be updated as ContinuousSpace::HasAddress() uses the limit, instead of the end, as the range end of the space https://googleplex-android-review.git.corp.google.com/365173. Bug: 11679102 Change-Id: Ie02a6b858145847e7ede76b6801ce0af5c71297d
-rw-r--r--runtime/gc/space/dlmalloc_space.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/gc/space/dlmalloc_space.cc b/runtime/gc/space/dlmalloc_space.cc
index 8a5e33a403..1c7aa22b74 100644
--- a/runtime/gc/space/dlmalloc_space.cc
+++ b/runtime/gc/space/dlmalloc_space.cc
@@ -318,6 +318,7 @@ DlMallocSpace* DlMallocSpace::CreateZygoteSpace(const char* alloc_space_name) {
DlMallocSpace* alloc_space =
new DlMallocSpace(alloc_space_name, mem_map.release(), mspace, end_, end, limit_,
growth_limit);
+ SetLimit(End());
live_bitmap_->SetHeapLimit(reinterpret_cast<uintptr_t>(End()));
CHECK_EQ(live_bitmap_->HeapLimit(), reinterpret_cast<uintptr_t>(End()));
mark_bitmap_->SetHeapLimit(reinterpret_cast<uintptr_t>(End()));