commit 582b68f654de87fb04b453f243733ffe119d1481
author Mathieu Chartier <mathieuc@google.com> Thu Feb 04 09:50:22 2016 -0800
committer Mathieu Chartier <mathieuc@google.com> Thu Feb 04 09:50:22 2016 -0800
tree 0a184bddacb3ded9c8a4c457676c207943a50477
parent 85b3b52a931b54380be3753216e97431ae2215a9

Use correct requested alloc space begin for CC

Now we restore the original value instead of setting to null.

Bug: 26970047
Change-Id: I94d546c3a69ddf11805990a1003707bf55013328

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 136b793..8269f76 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -271,7 +271,7 @@
     // The loaded spaces. Secondary images may fail to load, in which case we need to remove
     // already added spaces.
     std::vector<space::Space*> added_image_spaces;
-
+    uint8_t* const original_requested_alloc_space_begin = requested_alloc_space_begin;
     for (size_t index = 0; index < image_file_names.size(); ++index) {
       std::string& image_name = image_file_names[index];
       ATRACE_BEGIN("ImageSpace::Create");
@@ -320,7 +320,7 @@
           delete loaded_space;
         }
         boot_image_spaces_.clear();
-        requested_alloc_space_begin = nullptr;
+        requested_alloc_space_begin = original_requested_alloc_space_begin;
         break;
       }
     }