remove recursion from NewSpace::AllocateRaw*

src/heap/spaces.cc

Index: src/heap/spaces.cc
diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc
index f19821070b7efcc2dbe9aef861b5154d86525ef5..45adf1793aa1576f49b43df02de699f4654adc6f 100644
--- a/src/heap/spaces.cc
+++ b/src/heap/spaces.cc
@@ -1467,10 +1467,28 @@ bool NewSpace::AddFreshPage() {
 }
 
 
-AllocationResult NewSpace::SlowAllocateRaw(int size_in_bytes,
-                                           AllocationAlignment alignment) {
+bool NewSpace::EnsureAllocation(int size_in_bytes,
+                                AllocationAlignment alignment) {
   Address old_top = allocation_info_.top();
   Address high = to_space_.page_high();
+  if (old_top + size_in_bytes >= high) {

[Hannes Payer (out of office), 2015/07/31 07:50:52]

We should compare against aligned_size_in_bytes here. We can pass it in, or
recalculate in the beginning.

[ofrobots, 2015/07/31 13:47:38]

Done.

+    // Not enough room in the page, try to allocate a new one.
+    if (!AddFreshPage()) {
+      return false;
+    }
+
+    // Do a step for the bytes allocated on the last page.
+    int bytes_allocated = static_cast<int>(old_top - top_on_previous_step_);
+    heap()->incremental_marking()->Step(bytes_allocated,
+                                        IncrementalMarking::GC_VIA_STACK_GUARD);
+    top_on_previous_step_ = to_space_.page_low();

[Hannes Payer (out of office), 2015/07/31 07:50:52]

to_space_.page_low() should be the same as allocation_info_.top() in this case.
Just set top_on_previous_step_ = old_top after setting old_top.

[ofrobots, 2015/07/31 13:47:38]

Done.

+
+    old_top = allocation_info_.top();

[Hannes Payer (out of office), 2015/07/31 07:50:52]

Since we got a new top here, we have to recalculate aligned_size_in_bytes.

[ofrobots, 2015/07/31 13:47:39]

Done.

+    high = to_space_.page_high();
+  }
+
+  DCHECK(old_top + size_in_bytes < high);
+
   if (allocation_info_.limit() < high) {
     int alignment_size = Heap::GetFillToAlign(old_top, alignment);
     int aligned_size_in_bytes = size_in_bytes + alignment_size;
@@ -1484,19 +1502,8 @@ AllocationResult NewSpace::SlowAllocateRaw(int size_in_bytes,
                                         IncrementalMarking::GC_VIA_STACK_GUARD);
     UpdateInlineAllocationLimit(aligned_size_in_bytes);
     top_on_previous_step_ = new_top;
-    if (alignment == kWordAligned) return AllocateRawUnaligned(size_in_bytes);
-    return AllocateRawAligned(size_in_bytes, alignment);
-  } else if (AddFreshPage()) {
-    // Switched to new page. Try allocating again.
-    int bytes_allocated = static_cast<int>(old_top - top_on_previous_step_);
-    heap()->incremental_marking()->Step(bytes_allocated,
-                                        IncrementalMarking::GC_VIA_STACK_GUARD);
-    top_on_previous_step_ = to_space_.page_low();
-    if (alignment == kWordAligned) return AllocateRawUnaligned(size_in_bytes);
-    return AllocateRawAligned(size_in_bytes, alignment);
-  } else {
-    return AllocationResult::Retry();
   }
+  return true;
 }