Chromium Code Reviews| Index: src/mark-compact.cc |
| diff --git a/src/mark-compact.cc b/src/mark-compact.cc |
| index 9a89402c17c16daad2fd64a74fa83c76a9cf79be..5b584e9e25df5c726e9dcf83a32b8c8eab00b2a1 100644 |
| --- a/src/mark-compact.cc |
| +++ b/src/mark-compact.cc |
| @@ -4068,20 +4068,20 @@ intptr_t MarkCompactCollector::SweepConservatively(PagedSpace* space, |
| int MarkCompactCollector::SweepInParallel(PagedSpace* space, |
| - intptr_t required_freed_bytes) { |
| + int required_freed_bytes) { |
| PageIterator it(space); |
| FreeList* free_list = space == heap()->old_pointer_space() |
| ? free_list_old_pointer_space_.get() |
| : free_list_old_data_space_.get(); |
| FreeList private_free_list(space); |
| - intptr_t max_freed = 0; |
| - intptr_t max_freed_overall = 0; |
| + int max_freed = 0; |
| + int max_freed_overall = 0; |
| while (it.has_next()) { |
| Page* p = it.next(); |
| if (p->TryParallelSweeping()) { |
| - max_freed = SweepConservatively<SWEEP_IN_PARALLEL>( |
| - space, &private_free_list, p); |
| + max_freed = static_cast<int>(SweepConservatively<SWEEP_IN_PARALLEL>( |
|
Dmitry Lomov (no reviews)
2014/07/10 17:06:54
Please ASSERT no overflow
Hannes Payer (out of office)
2014/07/10 17:13:11
Done.
|
| + space, &private_free_list, p)); |
| free_list->Concatenate(&private_free_list); |
| if (required_freed_bytes > 0 && max_freed >= required_freed_bytes) { |
| return max_freed; |