[heap] Clean up RawSweep

src/heap/mark-compact.h

Index: src/heap/mark-compact.h
diff --git a/src/heap/mark-compact.h b/src/heap/mark-compact.h
index 07b289e2ba10225be9ef8a509e84783a88639fd3..9918fef172093785a8d9103d4980b02f8f5548d7 100644
--- a/src/heap/mark-compact.h
+++ b/src/heap/mark-compact.h
@@ -406,20 +406,14 @@ class MarkCompactCollector {
    public:
     class SweeperTask;
 
-    enum SweepingMode { SWEEP_ONLY, SWEEP_AND_VISIT_LIVE_OBJECTS };
-    enum SkipListRebuildingMode { REBUILD_SKIP_LIST, IGNORE_SKIP_LIST };
     enum FreeListRebuildingMode { REBUILD_FREE_LIST, IGNORE_FREE_LIST };
     enum FreeSpaceTreatmentMode { IGNORE_FREE_SPACE, ZAP_FREE_SPACE };

[Hannes Payer (out of office), 2016/07/04 11:02:09]

I think nobody is calling ZAP_FREE_SPACE anymore. Can we fix that?

[Michael Lippautz, 2016/07/04 11:16:54]

Done: Used Heap::ShouldZapGarbage() as indicator whether to zap or not.

-    enum SweepingParallelism { SWEEP_ON_MAIN_THREAD, SWEEP_IN_PARALLEL };
 
     typedef std::deque<Page*> SweepingList;
     typedef List<Page*> SweptList;
 
-    template <SweepingMode sweeping_mode, SweepingParallelism parallelism,
-              SkipListRebuildingMode skip_list_mode,
-              FreeListRebuildingMode free_list_mode,
-              FreeSpaceTreatmentMode free_space_mode>
-    static int RawSweep(PagedSpace* space, Page* p, ObjectVisitor* v);
+    static int RawSweep(Page* p, FreeListRebuildingMode free_list_mode,
+                        FreeSpaceTreatmentMode free_space_mode);
 
     explicit Sweeper(Heap* heap)
         : heap_(heap),