commit c7f4e3a5aeaa23342b4e03b0d751f60ac5c5815c
author Mathieu Chartier <mathieuc@google.com> Mon Jan 25 21:07:07 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 25 21:07:07 2016 +0000
tree 9644471b15c917a9bf3f5be86403afd7e5ee2b68
parent 4fe6ce5f48687cf24c91ac9865dbad497ed6c074
parent 966f533da85f5bf0b17c9de70598707cdc2655a7

Merge "Only create non-moving space at fixed address if zygote"

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index d6c1817..2fb5e34 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -375,12 +375,15 @@
   }
   // Attempt to create 2 mem maps at or after the requested begin.
   if (foreground_collector_type_ != kCollectorTypeCC) {
-    if (separate_non_moving_space) {
-      main_mem_map_1.reset(MapAnonymousPreferredAddress(kMemMapSpaceName[0], request_begin,
-                                                        capacity_, &error_str));
+    if (separate_non_moving_space || !is_zygote) {
+      main_mem_map_1.reset(MapAnonymousPreferredAddress(kMemMapSpaceName[0],
+                                                        request_begin,
+                                                        capacity_,
+                                                        &error_str));
     } else {
-      // If no separate non-moving space, the main space must come
-      // right after the image space to avoid a gap.
+      // If no separate non-moving space and we are the zygote, the main space must come right
+      // after the image space to avoid a gap. This is required since we want the zygote space to
+      // be adjacent to the image space.
       main_mem_map_1.reset(MemMap::MapAnonymous(kMemMapSpaceName[0], request_begin, capacity_,
                                                 PROT_READ | PROT_WRITE, true, false,
                                                 &error_str));