Bug 685593 - Remove unused argument from Debugger::markAllIteratively. r=jorendorff
authorAndrew McCreight <amccreight@mozilla.com>
Thu, 08 Sep 2011 10:34:47 -0700
changeset 76791 93236676065931db38a094a55c43dca3bc00a217
parent 76790 6b728c38e6c6bed446e514563050ae2a5f9f2ce7
child 76792 fe6136c24fa4de44013428bab57ad81aa947e24e
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersjorendorff
bugs685593
milestone9.0a1
Bug 685593 - Remove unused argument from Debugger::markAllIteratively. r=jorendorff
js/src/jsgc.cpp
js/src/vm/Debugger.cpp
js/src/vm/Debugger.h
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2255,17 +2255,17 @@ MarkAndSweep(JSContext *cx, JSCompartmen
     MarkRuntime(&gcmarker);
     gcmarker.drainMarkStack();
 
     /*
      * Mark weak roots.
      */
     while (WatchpointMap::markAllIteratively(&gcmarker) ||
            WeakMapBase::markAllIteratively(&gcmarker) ||
-           Debugger::markAllIteratively(&gcmarker, gckind))
+           Debugger::markAllIteratively(&gcmarker))
     {
         gcmarker.drainMarkStack();
     }
 
     rt->gcMarkingTracer = NULL;
 
     if (rt->gcCallback)
         (void) rt->gcCallback(cx, JSGC_MARK_END);
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1079,17 +1079,17 @@ Debugger::markCrossCompartmentDebuggerOb
  *      may yet be called.
  *   2. Mark breakpoint handlers.
  *
  * This happens during the iterative part of the GC mark phase. This method
  * returns true if it has to mark anything; GC calls it repeatedly until it
  * returns false.
  */
 bool
-Debugger::markAllIteratively(GCMarker *trc, JSGCInvocationKind gckind)
+Debugger::markAllIteratively(GCMarker *trc)
 {
     bool markedAny = false;
 
     /*
      * Find all Debugger objects in danger of GC. This code is a little
      * convoluted since the easiest way to find them is via their debuggees.
      */
     JSContext *cx = trc->context;
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -288,17 +288,17 @@ class Debugger {
      *       - it has a breakpoint set on a live script
      *       - it has a watchpoint set on a live object.
      *
      * Debugger::markAllIteratively handles the last case. If it finds any
      * Debugger objects that are definitely live but not yet marked, it marks
      * them and returns true. If not, it returns false.
      */
     static void markCrossCompartmentDebuggerObjectReferents(JSTracer *tracer);
-    static bool markAllIteratively(GCMarker *trc, JSGCInvocationKind gckind);
+    static bool markAllIteratively(GCMarker *trc);
     static void sweepAll(JSContext *cx);
     static void detachAllDebuggersFromGlobal(JSContext *cx, GlobalObject *global,
                                              GlobalObjectSet::Enum *compartmentEnum);
 
     static inline void onEnterFrame(JSContext *cx);
     static inline void onLeaveFrame(JSContext *cx);
     static inline JSTrapStatus onDebuggerStatement(JSContext *cx, js::Value *vp);
     static inline JSTrapStatus onExceptionUnwind(JSContext *cx, js::Value *vp);