commit 42ad490249be898efa1b1196d4ecdbe2cfc3e77b
author Mathieu Chartier <mathieuc@google.com> Thu Feb 19 22:45:16 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 19 22:45:17 2015 +0000
tree 367b6d34aa95f71896c972c69afb38cdefec41b6
parent 718859325c773e144bddac4281a1cc63c5e9fcde
parent c0a7e2bb1609da40ec67cb7e00c918637c610897

Merge "Do GC for alloc for unstarted runtimes"

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 419d555..452980cf 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -3154,8 +3154,12 @@
 }
 
 void Heap::RequestConcurrentGC(Thread* self) {
-  if (CanAddHeapTask(self) &&
-      concurrent_gc_pending_.CompareExchangeStrongSequentiallyConsistent(false, true)) {
+  // If we don't have a started runtime, then we don't have a thread which is running the heap
+  // tasks. In this case, do the GC in the allocating thread to ensure that memory gets freed.
+  if (!Runtime::Current()->IsFinishedStarting()) {
+    CollectGarbageInternal(collector::kGcTypeFull, kGcCauseForAlloc, false);
+  } else if (CanAddHeapTask(self) &&
+    concurrent_gc_pending_.CompareExchangeStrongSequentiallyConsistent(false, true)) {
     task_processor_->AddTask(self, new ConcurrentGCTask(NanoTime()));  // Start straight away.
   }
 }