Index: src/heap.cc |
diff --git a/src/heap.cc b/src/heap.cc |
index 447aebb3c1c1b367d98051bd5d2875f318284778..a0fe0e01cc79c854a035cb017cdeb81c59c09671 100644 |
--- a/src/heap.cc |
+++ b/src/heap.cc |
@@ -2019,28 +2019,6 @@ Address Heap::DoScavenge(ObjectVisitor* scavenge_visitor, |
} |
-STATIC_ASSERT((FixedDoubleArray::kHeaderSize & kDoubleAlignmentMask) == 0); |
-STATIC_ASSERT((ConstantPoolArray::kHeaderSize & kDoubleAlignmentMask) == 0); |
- |
- |
-INLINE(static HeapObject* EnsureDoubleAligned(Heap* heap, |
- HeapObject* object, |
- int size)); |
- |
-static HeapObject* EnsureDoubleAligned(Heap* heap, |
- HeapObject* object, |
- int size) { |
- if ((OffsetFrom(object->address()) & kDoubleAlignmentMask) != 0) { |
- heap->CreateFillerObjectAt(object->address(), kPointerSize); |
- return HeapObject::FromAddress(object->address() + kPointerSize); |
- } else { |
- heap->CreateFillerObjectAt(object->address() + size - kPointerSize, |
- kPointerSize); |
- return object; |
- } |
-} |
- |
- |
enum LoggingAndProfiling { |
LOGGING_AND_PROFILING_ENABLED, |
LOGGING_AND_PROFILING_DISABLED |
@@ -2219,7 +2197,7 @@ class ScavengingVisitor : public StaticVisitorBase { |
HeapObject* target = HeapObject::cast(result); |
if (alignment != kObjectAlignment) { |
- target = EnsureDoubleAligned(heap, target, allocation_size); |
+ target = heap->EnsureDoubleAligned(target, allocation_size); |
} |
// Order is important: slot might be inside of the target if target |
@@ -2248,7 +2226,7 @@ class ScavengingVisitor : public StaticVisitorBase { |
HeapObject* target = HeapObject::cast(result); |
if (alignment != kObjectAlignment) { |
- target = EnsureDoubleAligned(heap, target, allocation_size); |
+ target = heap->EnsureDoubleAligned(target, allocation_size); |
} |
// Order is important: slot might be inside of the target if target |
@@ -5444,7 +5422,7 @@ MaybeObject* Heap::AllocateRawFixedDoubleArray(int length, |
if (!maybe_object->To<HeapObject>(&object)) return maybe_object; |
} |
- return EnsureDoubleAligned(this, object, size); |
+ return EnsureDoubleAligned(object, size); |
} |
@@ -5465,7 +5443,7 @@ MaybeObject* Heap::AllocateConstantPoolArray(int number_of_int64_entries, |
{ MaybeObject* maybe_object = AllocateRaw(size, space, OLD_POINTER_SPACE); |
if (!maybe_object->To<HeapObject>(&object)) return maybe_object; |
} |
- object = EnsureDoubleAligned(this, object, size); |
+ object = EnsureDoubleAligned(object, size); |
HeapObject::cast(object)->set_map_no_write_barrier(constant_pool_array_map()); |
ConstantPoolArray* constant_pool = |