Commit 58e15ee2 authored by Dan Elphick's avatar Dan Elphick Committed by Commit Bot

Remove ObjectSpace and AllocationAction enums

ObjectSpace was only referred to in static_asserts and was otherwise
removed in http://codereview.chromium.org/7945009.

AllocationActions's last usage was removed in
https://codereview.chromium.org/1991293002.

Bug: v8:7310
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_rel_ng
Change-Id: I2ccbf3b674517bc698b4c92754cd0b251229d342
Reviewed-on: https://chromium-review.googlesource.com/931887Reviewed-by: 's avatarHannes Payer <hpayer@chromium.org>
Commit-Queue: Dan Elphick <delphick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51763}
parent cee2946f
...@@ -6232,24 +6232,6 @@ typedef void* (*CreateHistogramCallback)(const char* name, ...@@ -6232,24 +6232,6 @@ typedef void* (*CreateHistogramCallback)(const char* name,
typedef void (*AddHistogramSampleCallback)(void* histogram, int sample); typedef void (*AddHistogramSampleCallback)(void* histogram, int sample);
// --- Memory Allocation Callback ---
enum ObjectSpace {
kObjectSpaceNewSpace = 1 << 0,
kObjectSpaceOldSpace = 1 << 1,
kObjectSpaceCodeSpace = 1 << 2,
kObjectSpaceMapSpace = 1 << 3,
kObjectSpaceLoSpace = 1 << 4,
kObjectSpaceAll = kObjectSpaceNewSpace | kObjectSpaceOldSpace |
kObjectSpaceCodeSpace | kObjectSpaceMapSpace |
kObjectSpaceLoSpace
};
enum AllocationAction {
kAllocationActionAllocate = 1 << 0,
kAllocationActionFree = 1 << 1,
kAllocationActionAll = kAllocationActionAllocate | kAllocationActionFree
};
// --- Enter/Leave Script Callback --- // --- Enter/Leave Script Callback ---
typedef void (*BeforeCallEnteredCallback)(Isolate*); typedef void (*BeforeCallEnteredCallback)(Isolate*);
typedef void (*CallCompletedCallback)(Isolate*); typedef void (*CallCompletedCallback)(Isolate*);
......
...@@ -520,7 +520,6 @@ typedef bool (*WeakSlotCallbackWithHeap)(Heap* heap, Object** pointer); ...@@ -520,7 +520,6 @@ typedef bool (*WeakSlotCallbackWithHeap)(Heap* heap, Object** pointer);
// NOTE: SpaceIterator depends on AllocationSpace enumeration values being // NOTE: SpaceIterator depends on AllocationSpace enumeration values being
// consecutive. // consecutive.
// Keep this enum in sync with the ObjectSpace enum in v8.h
enum AllocationSpace { enum AllocationSpace {
NEW_SPACE, // Semispaces collected with copying collector. NEW_SPACE, // Semispaces collected with copying collector.
OLD_SPACE, // May contain pointers to new space. OLD_SPACE, // May contain pointers to new space.
......
...@@ -1401,15 +1401,6 @@ void MemoryChunk::ReleaseYoungGenerationBitmap() { ...@@ -1401,15 +1401,6 @@ void MemoryChunk::ReleaseYoungGenerationBitmap() {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// PagedSpace implementation // PagedSpace implementation
STATIC_ASSERT(static_cast<ObjectSpace>(1 << AllocationSpace::NEW_SPACE) ==
ObjectSpace::kObjectSpaceNewSpace);
STATIC_ASSERT(static_cast<ObjectSpace>(1 << AllocationSpace::OLD_SPACE) ==
ObjectSpace::kObjectSpaceOldSpace);
STATIC_ASSERT(static_cast<ObjectSpace>(1 << AllocationSpace::CODE_SPACE) ==
ObjectSpace::kObjectSpaceCodeSpace);
STATIC_ASSERT(static_cast<ObjectSpace>(1 << AllocationSpace::MAP_SPACE) ==
ObjectSpace::kObjectSpaceMapSpace);
void Space::AddAllocationObserver(AllocationObserver* observer) { void Space::AddAllocationObserver(AllocationObserver* observer) {
allocation_observers_.push_back(observer); allocation_observers_.push_back(observer);
StartNextInlineAllocationStep(); StartNextInlineAllocationStep();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment