Backed out changeset 12525933eb9e (bug 1501666) for sm build bustages on a CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Fri, 30 Nov 2018 04:17:46 +0200
changeset 505331 2f0e92d76c4e96fe66f0aab96075c22b3692f116
parent 505330 c4a45f2bd13972fb4728aefab69197c6d2eb2215
child 505332 a96e2090fc20e98393d6b365b30f0283f8481849
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1501666
milestone65.0a1
backs out12525933eb9e4b77aed03ef536aac18a36f81278
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 12525933eb9e (bug 1501666) for sm build bustages on a CLOSED TREE
js/src/jit-test/tests/debug/bug1501666.js
js/src/vm/Debugger.cpp
deleted file mode 100644
--- a/js/src/jit-test/tests/debug/bug1501666.js
+++ /dev/null
@@ -1,16 +0,0 @@
-async function gg() {
-    await 3;
-    await 3;
-}
-gg();
-gg();
-var g = newGlobal();
-g.parent = this;
-g.eval(`
-    var dbg = Debugger(parent);
-    dbg.onEnterFrame = function(frame) {
-        frame.onStep = function() {};
-    };
-`);
-
-drainJobQueue();
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -2371,37 +2371,22 @@ Debugger::onSingleStep(JSContext* cx, Mu
         uint32_t stepperCount = 0;
         JSScript* trappingScript = iter.script();
         GlobalObject* global = cx->global();
         if (GlobalObject::DebuggerVector* debuggers = global->getDebuggers()) {
             for (auto p = debuggers->begin(); p != debuggers->end(); p++) {
                 Debugger* dbg = *p;
                 for (FrameMap::Range r = dbg->frames.all(); !r.empty(); r.popFront()) {
                     AbstractFramePtr frame = r.front().key();
-                    NativeObject* frameObj = r.front().value();
+                    NativeObject* frameobj = r.front().value();
                     if (frame.isWasmDebugFrame()) {
                         continue;
                     }
                     if (frame.script() == trappingScript &&
-                        !frameObj->getReservedSlot(JSSLOT_DEBUGFRAME_ONSTEP_HANDLER).isUndefined())
-                    {
-                        stepperCount++;
-                    }
-                }
-
-                // Also count hooks set on suspended generator frames.
-                for (GeneratorWeakMap::Range r = dbg->generatorFrames.all(); !r.empty(); r.popFront()) {
-                    GeneratorObject& genObj = r.front().key()->as<GeneratorObject>();
-                    DebuggerFrame& frameObj = r.front().value()->as<DebuggerFrame>();
-
-                    // Running frames were already counted in dbg->frames loop.
-                    if (!genObj.isRunning() &&
-                        !genObj.callee().isInterpretedLazy() &&
-                        genObj.callee().nonLazyScript() == trappingScript &&
-                        !frameObj.getReservedSlot(JSSLOT_DEBUGFRAME_ONSTEP_HANDLER).isUndefined())
+                        !frameobj->getReservedSlot(JSSLOT_DEBUGFRAME_ONSTEP_HANDLER).isUndefined())
                     {
                         stepperCount++;
                     }
                 }
             }
         }
         MOZ_ASSERT(stepperCount == trappingScript->stepModeCount());
     }