Bug 1431434 - Merge SweepRegExps with SweepMisc; r=jonco

MozReview-Commit-ID: 7EHJ5LOOuLQ

--HG--
extra : rebase_source : ac054fc26da7238fd5ba3bd63d32c5e136c44c0a

js/src/gc/GC.cpp

@@ -5427,13 +5427,6 @@ SweepObjectGroups(JSRuntime* runtime)
         c->objectGroups.sweep();
 }
 
-static void
-SweepRegExps(JSRuntime* runtime)
-{
-    for (SweepGroupCompartmentsIter c(runtime); !c.done(); c.next())
-        c->sweepRegExps();
-}
-
 static void
 SweepMisc(JSRuntime* runtime)
 {
@@ -5443,6 +5436,7 @@ SweepMisc(JSRuntime* runtime)
         c->sweepSavedStacks();
         c->sweepSelfHostingScriptSource();
         c->sweepNativeIterators();
+        c->sweepRegExps();
     }
 }
 
@@ -5714,7 +5708,6 @@ GCRuntime::beginSweepingSweepGroup(FreeOp* fop, SliceBudget& budget)
 
         AutoRunParallelTask sweepCCWrappers(rt, SweepCCWrappers, PhaseKind::SWEEP_CC_WRAPPER, lock);
         AutoRunParallelTask sweepObjectGroups(rt, SweepObjectGroups, PhaseKind::SWEEP_TYPE_OBJECT, lock);
-        AutoRunParallelTask sweepRegExps(rt, SweepRegExps, PhaseKind::SWEEP_REGEXP, lock);
         AutoRunParallelTask sweepMisc(rt, SweepMisc, PhaseKind::SWEEP_MISC, lock);
         AutoRunParallelTask sweepCompTasks(rt, SweepCompressionTasks, PhaseKind::SWEEP_COMPRESSION, lock);
         AutoRunParallelTask sweepWeakMaps(rt, SweepWeakMaps, PhaseKind::SWEEP_WEAKMAPS, lock);