Clean-up aligned allocation logic.

src/heap/heap.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/accessors.h"
 #include "src/api.h"
 #include "src/base/bits.h"
 #include "src/base/once.h"
@@ skipping 1018 matching lines @@
       if (space == LO_SPACE) {
         DCHECK_EQ(1, reservation->length());
         perform_gc = !lo_space()->CanAllocateSize(reservation->at(0).size);
       } else {
         for (auto& chunk : *reservation) {
           AllocationResult allocation;
           int size = chunk.size;
           DCHECK_LE(size, MemoryAllocator::PageAreaSize(
                               static_cast<AllocationSpace>(space)));
           if (space == NEW_SPACE) {
-            allocation = new_space()->AllocateRaw(size);
+            allocation = new_space()->AllocateRawUnaligned(size);
           } else {
-            allocation = paged_space(space)->AllocateRaw(size);
+            allocation = paged_space(space)->AllocateRawUnaligned(size);
           }
           HeapObject* free_space;
           if (allocation.To(&free_space)) {
             // Mark with a free list node, in case we have a GC before
             // deserializing.
             Address free_space_address = free_space->address();
             CreateFillerObjectAt(free_space_address, size);
             DCHECK(space < Serializer::kNumberOfPreallocatedSpaces);
             chunk.start = free_space_address;
             chunk.end = free_space_address + size;
@@ skipping 1087 matching lines @@
       }
     }
   }
 
   template <int alignment>
   static inline bool SemiSpaceCopyObject(Map* map, HeapObject** slot,
                                          HeapObject* object, int object_size) {
     Heap* heap = map->GetHeap();
 
     DCHECK(heap->AllowedToBeMigrated(object, NEW_SPACE));
-    AllocationResult allocation;
-#ifdef V8_HOST_ARCH_32_BIT
-    if (alignment == kDoubleAlignment) {
-      allocation =
-          heap->new_space()->AllocateRawAligned(object_size, kDoubleAligned);
-    } else {
-      allocation = heap->new_space()->AllocateRaw(object_size);
-    }
-#else
-    allocation = heap->new_space()->AllocateRaw(object_size);
-#endif
+    AllocationAlignment align =
+        alignment == kDoubleAlignment ? kDoubleAligned : kWordAligned;
+    AllocationResult allocation =
+        heap->new_space()->AllocateRaw(object_size, align);
 
     HeapObject* target = NULL;  // Initialization to please compiler.
     if (allocation.To(&target)) {
       // Order is important here: Set the promotion limit before storing a
       // filler for double alignment or migrating the object. Otherwise we
       // may end up overwriting promotion queue entries when we migrate the
       // object.
       heap->promotion_queue()->SetNewLimit(heap->new_space()->top());
 
       MigrateObject(heap, object, target, object_size);
 
       // Update slot to new target.
       *slot = target;
 
       heap->IncrementSemiSpaceCopiedObjectSize(object_size);
       return true;
     }
     return false;
   }
 
 
   template <ObjectContents object_contents, int alignment>
   static inline bool PromoteObject(Map* map, HeapObject** slot,
                                    HeapObject* object, int object_size) {
     Heap* heap = map->GetHeap();
 
-    AllocationResult allocation;
-#ifdef V8_HOST_ARCH_32_BIT
-    if (alignment == kDoubleAlignment) {
-      allocation =
-          heap->old_space()->AllocateRawAligned(object_size, kDoubleAligned);
-    } else {
-      allocation = heap->old_space()->AllocateRaw(object_size);
-    }
-#else
-    allocation = heap->old_space()->AllocateRaw(object_size);
-#endif
+    AllocationAlignment align =
+        alignment == kDoubleAlignment ? kDoubleAligned : kWordAligned;
+    AllocationResult allocation =
+        heap->old_space()->AllocateRaw(object_size, align);
 
     HeapObject* target = NULL;  // Initialization to please compiler.
     if (allocation.To(&target)) {
       MigrateObject(heap, object, target, object_size);
 
       // Update slot to new target.
       *slot = target;
 
       if (object_contents == POINTER_OBJECT) {
         if (map->instance_type() == JS_FUNCTION_TYPE) {
@@ skipping 4323 matching lines @@
       }
       delete list;
     } else {
       prev = list;
     }
     list = next;
   }
 }
 }
 }  // namespace v8::internal