commit 47ba978e95896c932300fb3236ce5eb4b438d971
author Hiroshi Yamauchi <yamauchi@google.com> Fri Aug 08 21:17:06 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 07 15:37:25 2014 +0000
tree 80208d34d0933c161c44284a9200c93d3b5c5efa
parent f0d30ed8fcffc839ceb91359a547c0efb7641d53
parent e0d6421cdb42508f4d36f28cc9eddc31271bb37a

Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index bf8cca7..02cd25c 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -1634,9 +1634,16 @@
         RemoveSpace(bump_pointer_space_);
         bump_pointer_space_ = nullptr;
         const char* name = kUseRosAlloc ? kRosAllocSpaceName[1] : kDlMallocSpaceName[1];
+        // Temporarily unprotect the backup mem map so rosalloc can write the debug magic number.
+        if (kIsDebugBuild && kUseRosAlloc) {
+          mem_map->Protect(PROT_READ | PROT_WRITE);
+        }
         main_space_backup_.reset(CreateMallocSpaceFromMemMap(mem_map.get(), kDefaultInitialSize,
                                                              mem_map->Size(), mem_map->Size(),
                                                              name, true));
+        if (kIsDebugBuild && kUseRosAlloc) {
+          mem_map->Protect(PROT_NONE);
+        }
         mem_map.release();
       }
       break;