diff --git a/src/heap-inl.h b/src/heap-inl.h index f28b82c732..d42e1cfc11 100644 --- a/src/heap-inl.h +++ b/src/heap-inl.h @@ -555,8 +555,7 @@ bool Heap::CollectGarbage(AllocationSpace space, const v8::GCCallbackFlags callbackFlags) { const char* collector_reason = NULL; GarbageCollector collector = SelectGarbageCollector(space, &collector_reason); - return CollectGarbage( - space, collector, gc_reason, collector_reason, callbackFlags); + return CollectGarbage(collector, gc_reason, collector_reason, callbackFlags); } diff --git a/src/heap.cc b/src/heap.cc index a6db39c58c..4eadabefe5 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -739,7 +739,7 @@ void Heap::CollectAllAvailableGarbage(const char* gc_reason) { const int kMaxNumberOfAttempts = 7; const int kMinNumberOfAttempts = 2; for (int attempt = 0; attempt < kMaxNumberOfAttempts; attempt++) { - if (!CollectGarbage(OLD_POINTER_SPACE, MARK_COMPACTOR, gc_reason, NULL) && + if (!CollectGarbage(MARK_COMPACTOR, gc_reason, NULL) && attempt + 1 >= kMinNumberOfAttempts) { break; } @@ -751,8 +751,7 @@ void Heap::CollectAllAvailableGarbage(const char* gc_reason) { } -bool Heap::CollectGarbage(AllocationSpace space, - GarbageCollector collector, +bool Heap::CollectGarbage(GarbageCollector collector, const char* gc_reason, const char* collector_reason, const v8::GCCallbackFlags gc_callback_flags) { diff --git a/src/heap.h b/src/heap.h index fae2117661..011ffd5e68 100644 --- a/src/heap.h +++ b/src/heap.h @@ -2123,7 +2123,6 @@ class Heap { // Returns whether there is a chance that another major GC could // collect more garbage. bool CollectGarbage( - AllocationSpace space, GarbageCollector collector, const char* gc_reason, const char* collector_reason,