Revert of Remove promotion backup case and report OOM instead.

src/heap/mark-compact.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/base/atomicops.h"
 #include "src/base/bits.h"
 #include "src/code-stubs.h"
 #include "src/compilation-cache.h"
@@ skipping 1843 matching lines @@
 
       int size = object->Size();
       survivors_size += size;
 
       Heap::UpdateAllocationSiteFeedback(object, Heap::RECORD_SCRATCHPAD_SLOT);
 
       offset++;
       current_cell >>= 1;
 
       // TODO(hpayer): Refactor EvacuateObject and call this function instead.
-      if (heap()->ShouldBePromoted(object->address(), size)) {
-        if (!TryPromoteObject(object, size)) {
-          V8::FatalProcessOutOfMemory("Full GC promotion failed");
+      if (heap()->ShouldBePromoted(object->address(), size) &&
+          TryPromoteObject(object, size)) {
+        continue;
+      }
+
+      AllocationResult allocation = new_space->AllocateRaw(size);
+      if (allocation.IsRetry()) {
+        if (!new_space->AddFreshPage()) {
+          // Shouldn't happen. We are sweeping linearly, and to-space
+          // has the same number of pages as from-space, so there is
+          // always room.
+          UNREACHABLE();
         }
-      } else {
-        AllocationResult allocation = new_space->AllocateRaw(size);
-        if (allocation.IsRetry()) {
-          if (!new_space->AddFreshPage()) {
-            // Shouldn't happen. We are sweeping linearly, and to-space
-            // has the same number of pages as from-space, so there is
-            // always room.
-            UNREACHABLE();
-          }
-          allocation = new_space->AllocateRaw(size);
-          DCHECK(!allocation.IsRetry());
-        }
-        Object* target = allocation.ToObjectChecked();
+        allocation = new_space->AllocateRaw(size);
+        DCHECK(!allocation.IsRetry());
+      }
+      Object* target = allocation.ToObjectChecked();
 
-        MigrateObject(HeapObject::cast(target), object, size, NEW_SPACE);
-        heap()->IncrementSemiSpaceCopiedObjectSize(size);
-      }
+      MigrateObject(HeapObject::cast(target), object, size, NEW_SPACE);
+      heap()->IncrementSemiSpaceCopiedObjectSize(size);
     }
     *cells = 0;
   }
   return survivors_size;
 }
 
 
 static void DiscoverGreyObjectsInSpace(Heap* heap, MarkingDeque* marking_deque,
                                        PagedSpace* space) {
   PageIterator it(space);
@@ skipping 2521 matching lines @@
   SlotsBuffer* buffer = *buffer_address;
   while (buffer != NULL) {
     SlotsBuffer* next_buffer = buffer->next();
     DeallocateBuffer(buffer);
     buffer = next_buffer;
   }
   *buffer_address = NULL;
 }
 }
 }  // namespace v8::internal