Skip to content

Commit

Permalink
Generalize alignment in heap GC functions.
Browse files Browse the repository at this point in the history 
Changes template parameters from int to AllocationAlignment.

LOG=N
BUG=v8:4124

Review URL: https://codereview.chromium.org/1152513002

Cr-Commit-Position: refs/heads/master@{#28587}
  • Loading branch information
bbudge authored and Commit bot committed May 22, 2015
1 parent 4f4c90d commit 871ab7f
Showing 1 changed file with 19 additions and 29 deletions.
48 changes: 19 additions & 29 deletions src/heap/heap.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2151,16 +2151,14 @@ class ScavengingVisitor : public StaticVisitorBase {
}
}

template <int alignment>
template <AllocationAlignment alignment>
static inline bool SemiSpaceCopyObject(Map* map, HeapObject** slot,
HeapObject* object, int object_size) {
Heap* heap = map->GetHeap();

DCHECK(heap->AllowedToBeMigrated(object, NEW_SPACE));
AllocationAlignment align =
alignment == kDoubleAlignment ? kDoubleAligned : kWordAligned;
AllocationResult allocation =
heap->new_space()->AllocateRaw(object_size, align);
heap->new_space()->AllocateRaw(object_size, alignment);

HeapObject* target = NULL; // Initialization to please compiler.
if (allocation.To(&target)) {
Expand All @@ -2182,15 +2180,13 @@ class ScavengingVisitor : public StaticVisitorBase {
}


template <ObjectContents object_contents, int alignment>
template <ObjectContents object_contents, AllocationAlignment alignment>
static inline bool PromoteObject(Map* map, HeapObject** slot,
HeapObject* object, int object_size) {
Heap* heap = map->GetHeap();

AllocationAlignment align =
alignment == kDoubleAlignment ? kDoubleAligned : kWordAligned;
AllocationResult allocation =
heap->old_space()->AllocateRaw(object_size, align);
heap->old_space()->AllocateRaw(object_size, alignment);

HeapObject* target = NULL; // Initialization to please compiler.
if (allocation.To(&target)) {
Expand All @@ -2214,7 +2210,7 @@ class ScavengingVisitor : public StaticVisitorBase {
}


template <ObjectContents object_contents, int alignment>
template <ObjectContents object_contents, AllocationAlignment alignment>
static inline void EvacuateObject(Map* map, HeapObject** slot,
HeapObject* object, int object_size) {
SLOW_DCHECK(object_size <= Page::kMaxRegularHeapObjectSize);
Expand Down Expand Up @@ -2268,59 +2264,53 @@ class ScavengingVisitor : public StaticVisitorBase {
static inline void EvacuateFixedArray(Map* map, HeapObject** slot,
HeapObject* object) {
int object_size = FixedArray::BodyDescriptor::SizeOf(map, object);
EvacuateObject<POINTER_OBJECT, kObjectAlignment>(map, slot, object,
object_size);
EvacuateObject<POINTER_OBJECT, kWordAligned>(map, slot, object,
object_size);
}


static inline void EvacuateFixedDoubleArray(Map* map, HeapObject** slot,
HeapObject* object) {
int length = reinterpret_cast<FixedDoubleArray*>(object)->length();
int object_size = FixedDoubleArray::SizeFor(length);
EvacuateObject<DATA_OBJECT, kDoubleAlignment>(map, slot, object,
object_size);
EvacuateObject<DATA_OBJECT, kDoubleAligned>(map, slot, object, object_size);
}


static inline void EvacuateFixedTypedArray(Map* map, HeapObject** slot,
HeapObject* object) {
int object_size = reinterpret_cast<FixedTypedArrayBase*>(object)->size();
EvacuateObject<DATA_OBJECT, kObjectAlignment>(map, slot, object,
object_size);
EvacuateObject<DATA_OBJECT, kWordAligned>(map, slot, object, object_size);
}


static inline void EvacuateFixedFloat64Array(Map* map, HeapObject** slot,
HeapObject* object) {
int object_size = reinterpret_cast<FixedFloat64Array*>(object)->size();
EvacuateObject<DATA_OBJECT, kDoubleAlignment>(map, slot, object,
object_size);
EvacuateObject<DATA_OBJECT, kDoubleAligned>(map, slot, object, object_size);
}


static inline void EvacuateByteArray(Map* map, HeapObject** slot,
HeapObject* object) {
int object_size = reinterpret_cast<ByteArray*>(object)->ByteArraySize();
EvacuateObject<DATA_OBJECT, kObjectAlignment>(map, slot, object,
object_size);
EvacuateObject<DATA_OBJECT, kWordAligned>(map, slot, object, object_size);
}


static inline void EvacuateSeqOneByteString(Map* map, HeapObject** slot,
HeapObject* object) {
int object_size = SeqOneByteString::cast(object)
->SeqOneByteStringSize(map->instance_type());
EvacuateObject<DATA_OBJECT, kObjectAlignment>(map, slot, object,
object_size);
EvacuateObject<DATA_OBJECT, kWordAligned>(map, slot, object, object_size);
}


static inline void EvacuateSeqTwoByteString(Map* map, HeapObject** slot,
HeapObject* object) {
int object_size = SeqTwoByteString::cast(object)
->SeqTwoByteStringSize(map->instance_type());
EvacuateObject<DATA_OBJECT, kObjectAlignment>(map, slot, object,
object_size);
EvacuateObject<DATA_OBJECT, kWordAligned>(map, slot, object, object_size);
}


Expand Down Expand Up @@ -2357,8 +2347,8 @@ class ScavengingVisitor : public StaticVisitorBase {
}

int object_size = ConsString::kSize;
EvacuateObject<POINTER_OBJECT, kObjectAlignment>(map, slot, object,
object_size);
EvacuateObject<POINTER_OBJECT, kWordAligned>(map, slot, object,
object_size);
}

template <ObjectContents object_contents>
Expand All @@ -2367,14 +2357,14 @@ class ScavengingVisitor : public StaticVisitorBase {
template <int object_size>
static inline void VisitSpecialized(Map* map, HeapObject** slot,
HeapObject* object) {
EvacuateObject<object_contents, kObjectAlignment>(map, slot, object,
object_size);
EvacuateObject<object_contents, kWordAligned>(map, slot, object,
object_size);
}

static inline void Visit(Map* map, HeapObject** slot, HeapObject* object) {
int object_size = map->instance_size();
EvacuateObject<object_contents, kObjectAlignment>(map, slot, object,
object_size);
EvacuateObject<object_contents, kWordAligned>(map, slot, object,
object_size);
}
};

Expand Down

0 comments on commit 871ab7f

Please sign in to comment.