| Index: src/heap/heap.cc
|
| diff --git a/src/heap/heap.cc b/src/heap/heap.cc
|
| index e68f8ec2067c9791b295727f9192f8c6698cea82..558826fc229046c6f636d53d6d32fc17595e8d7b 100644
|
| --- a/src/heap/heap.cc
|
| +++ b/src/heap/heap.cc
|
| @@ -917,7 +917,7 @@ void Heap::CollectAllAvailableGarbage(GarbageCollectionReason gc_reason) {
|
| const int kMaxNumberOfAttempts = 7;
|
| const int kMinNumberOfAttempts = 2;
|
| for (int attempt = 0; attempt < kMaxNumberOfAttempts; attempt++) {
|
| - if (!CollectGarbage(MARK_COMPACTOR, gc_reason, NULL,
|
| + if (!CollectGarbage(OLD_SPACE, gc_reason,
|
| v8::kGCCallbackFlagCollectAllAvailableGarbage) &&
|
| attempt + 1 >= kMinNumberOfAttempts) {
|
| break;
|
| @@ -978,14 +978,16 @@ void Heap::EnsureFillerObjectAtTop() {
|
| }
|
| }
|
|
|
| -bool Heap::CollectGarbage(GarbageCollector collector,
|
| +bool Heap::CollectGarbage(AllocationSpace space,
|
| GarbageCollectionReason gc_reason,
|
| - const char* collector_reason,
|
| const v8::GCCallbackFlags gc_callback_flags) {
|
| // The VM is in the GC state until exiting this function.
|
| VMState<GC> state(isolate());
|
| RuntimeCallTimerScope runtime_timer(isolate(), &RuntimeCallStats::GC);
|
|
|
| + const char* collector_reason = NULL;
|
| + GarbageCollector collector = SelectGarbageCollector(space, &collector_reason);
|
| +
|
| #ifdef DEBUG
|
| // Reset the allocation timeout to the GC interval, but make sure to
|
| // allow at least a few allocations after a collection. The reason
|
|
|