- Trigger old-gen GCs when needed.

vm/heap.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/heap.h"
 
 #include "vm/assert.h"
 #include "vm/compiler_stats.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
@@ skipping 36 matching lines @@
   delete code_space_;
 }
 
 
 uword Heap::AllocateNew(intptr_t size) {
   ASSERT(Isolate::Current()->no_gc_scope_depth() == 0);
   uword addr = new_space_->TryAllocate(size);
   if (addr != 0) {
     return addr;
   }
-  new_space_->Scavenge();
+  CollectGarbage(kNew);
   if (FLAG_verbose_gc) {
     OS::PrintErr("New space (%dk) Old space (%dk) Code space (%dk)\n",
                  (new_space_->in_use() / KB),
                  (old_space_->in_use() / KB),
                  (code_space_->in_use() / KB));
   }
   addr = new_space_->TryAllocate(size);
   if (addr != 0) {
     return addr;
   }
   return AllocateOld(size);
 }
 
 
 uword Heap::AllocateOld(intptr_t size) {
   ASSERT(Isolate::Current()->no_gc_scope_depth() == 0);
   uword addr = old_space_->TryAllocate(size);
   if (addr == 0) {
-    // TODO(iposva): Support GC.
-    FATAL("Exhausted heap space.");
+    CollectGarbage(kOld);
+    if (FLAG_verbose_gc) {

[cshapiro, 2011/12/19 17:44:48]

Lines 77-82 are a copy of lines 58-63.  Maybe it is time to pull this code out
and place it into a separate method?

[Ivan Posva, 2011/12/19 19:24:23]

I am planning to pull the GC stats gathering out into a whole separate class,
which will remove this duplication here.

+      OS::PrintErr("New space (%dk) Old space (%dk) Code space (%dk)\n",
+                   (new_space_->in_use() / KB),
+                   (old_space_->in_use() / KB),
+                   (code_space_->in_use() / KB));
+    }
+    addr = old_space_->TryAllocate(size);
   }
   return addr;
 }
 
 
 uword Heap::AllocateCode(intptr_t size) {
   ASSERT(Isolate::Current()->no_gc_scope_depth() == 0);
   ASSERT(Utils::IsAligned(size, OS::PreferredCodeAlignment()));
   uword addr = code_space_->TryAllocate(size);
   if (addr == 0) {
@@ skipping 93 matching lines @@
   isolate()->IncrementNoGCScopeDepth();
 }
 
 
 NoGCScope::~NoGCScope() {
   isolate()->DecrementNoGCScopeDepth();
 }
 #endif  // defined(DEBUG)
 
 }  // namespace dart