From d9f546cf87988ecb39bccd7d9300d42c51c8fd1a Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Mon, 28 Oct 2019 08:27:54 +0000
Subject: [PATCH] Bug 1570178 - Part 4: Support setting onPop when the frame is
 not live. r=jimb

Since we're now allowing onStep when not live, it makes sense to do the same
for onPop, and since it does not have any implementation details preventing
setting it while the frame is dead, we might as well.

Differential Revision: https://phabricator.services.mozilla.com/D50432

--HG--
extra : moz-landing-system : lando
---
 js/src/debugger/Frame.cpp                     |   6 +-
 .../binast/lazy/debug/Frame-onPop-07.binjs    | Bin 1420 -> 0 bytes
 .../binast/nonlazy/debug/Frame-onPop-07.binjs | Bin 1419 -> 0 bytes
 js/src/jit-test/tests/debug/Frame-onPop-07.js |  30 --------
 .../debug/Frame-onPop-assign-function.js      |  48 +++++++++++++
 .../debug/Frame-onPop-assign-generator.js     |  68 ++++++++++++++++++
 6 files changed, 119 insertions(+), 33 deletions(-)
 delete mode 100644 js/src/jit-test/tests/binast/lazy/debug/Frame-onPop-07.binjs
 delete mode 100644 js/src/jit-test/tests/binast/nonlazy/debug/Frame-onPop-07.binjs
 delete mode 100644 js/src/jit-test/tests/debug/Frame-onPop-07.js
 create mode 100644 js/src/jit-test/tests/debug/Frame-onPop-assign-function.js
 create mode 100644 js/src/jit-test/tests/debug/Frame-onPop-assign-generator.js

diff --git a/js/src/debugger/Frame.cpp b/js/src/debugger/Frame.cpp
index 617a45678e00..e712711bc1b0 100644
--- a/js/src/debugger/Frame.cpp
+++ b/js/src/debugger/Frame.cpp
@@ -1042,8 +1042,6 @@ OnPopHandler* DebuggerFrame::onPopHandler() const {
 }
 
 void DebuggerFrame::setOnPopHandler(JSContext* cx, OnPopHandler* handler) {
-  MOZ_ASSERT(isLive());
-
   OnPopHandler* prior = onPopHandler();
   if (handler == prior) {
     return;
@@ -1232,7 +1230,9 @@ bool DebuggerFrame::CallData::ToNative(JSContext* cx, unsigned argc,
   // These methods do not require liveness.
   bool checkLive = MyMethod != &CallData::liveGetter &&
                    MyMethod != &CallData::onStepGetter &&
-                   MyMethod != &CallData::onStepSetter;
+                   MyMethod != &CallData::onStepSetter &&
+                   MyMethod != &CallData::onPopGetter &&
+                   MyMethod != &CallData::onPopSetter;
 
   RootedDebuggerFrame frame(cx,
                             DebuggerFrame::check(cx, args.thisv(), checkLive));
diff --git a/js/src/jit-test/tests/binast/lazy/debug/Frame-onPop-07.binjs b/js/src/jit-test/tests/binast/lazy/debug/Frame-onPop-07.binjs
deleted file mode 100644
index 5b8598bc80e1a2be14c7084c8b175a32ec9888b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1420
zcmZWoZA%+L5FVFnIF1mGAR&YxN05+e5D^hkE1DRsqNy0$FVe#1vbk(~*-iI0YFhex
z`uqA1I=jhvX}vEu`#kgV%<OFIvU}Ad4;Oc*H#etupZS0Z&Gqc?kJoKn+QX1D)p?#M
zmLyz?dS>=C)ohIZ)i#ae3~w5Ohc|58UyiJ`xEOE|Wm&hcxn_#SEh%G0MV4V}LG-l3
zfDCV(CJ9rT4bE5?Q^f{dI%WpskuX9s&)p2Xrz&DPt6Kj=6{r1}&6A*1Dc1kTq=NOd
zSSyy{w_YeG%(G@QC2pz0`q+XcgA~SGa{wErYL<!GZp-mxit_&-O>i#Nn8q*plHK#E
z2#v5TxGjao7L(>R{V{t@r?c!%$4v1si`!qm4V1VT)qE;zr%KT!g|)PYmYfPZ-K|$h
zVw*co@mra2qjX8Wxs{!i?}ds_^hGTDG`5kYHr3&%9n)#T_RU00DfE7IhvhS>>8--K
zD?KaYh+Y=1zSxhHGzBYN_LOxUeCU5=;nG6n=Q?WlYG&)d<O)7c2Dryr=tJ-R?y`H)
z%ih8pr<Hr8ibVOLx$wlNb`3k<3D3nca@iw|$uO5Nog4Hc@|=&Ei1f&f`6C0;a2xpf
zXRJSsBBs2KQc?xO#RUh$#@pa$@N44*h%A8c;W9e1D02Ux+@i=KS{hL?h*<~ML{$ZQ
zGNYwRn|D#f<NOB7xKhU9+%)1zaVsb8WSWdBQ$Z*A#zT&?7&x1o&gMIEw8}-IsR)@I
zKHT4RI@w5mJMZ_sLJ^?gz)FGO-^0HT_*GYdlw9J#HaRE9tu1ebI5{ABl3!1adTKOM
zW5Wg&&mbT`tnHQU&)EjzZ$WWq1Hf$(_|gDaBYRK)Sg8}YP!0fc<mjmA<*QgThouVT
zc}ZuFK!NzkRBRa+tOI!YwS}isY8u4={>h17bQcGJ+A+8}a7x#3P;{#mtUM1`2M64;
z2UeNy!Ij}0)MtrZBXJ)GU?duOV8o&PqVKI7?2?^T<X24yvFU0jn5bs7qHMr)e*y8l
Bq_+S7

diff --git a/js/src/jit-test/tests/binast/nonlazy/debug/Frame-onPop-07.binjs b/js/src/jit-test/tests/binast/nonlazy/debug/Frame-onPop-07.binjs
deleted file mode 100644
index 7e6b07c1719d62ab39e1b85336017b6709ee37bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1419
zcmZWoT}vB56ul1Huq+`gK|%;YmLMTj2_hn*Rx~kMMN=`hFVcs}X0n-fGn39v)KL0s
z`V;#HdS{Z&rgdL-=G>2S?#HyQyEi@ZboFq4cX$5ql@FNET+fdGc-_Xey$m^1o!5zC
zNy4S5XUCqVnvK!F+NN=w;XB5_!#g(auSV8dTnxB~vaGweTr)-EmXtB0BFoTR7<yV^
zK!!KYlY}YF1{W-hsbYgJ9Ww*+NEjiR=Y9r0QWY_svDUv(#c4lg^CT!$ip~EqsbDiD
zYsE7B-V5b~dG@%I8t$n=ek{QngA~SGa{vpbYL<!GZOidwit_(&O|wHIrY@%<G-9%V
z;8LnFjh8&h{#&266dFrU(q?w2W2ShRB{^Ij2WnjOYTlNObEW8t#9CTJOHPGtZ}Sb3
z*y>JG{9Y#9$X?ND#<G{%d!gbJeHF_-jcsJ9O?5bG$8?&oL(>vNh2C$5SiYc|-Yaap
z(z7!5V!3hk#e$?pLs;pum#pgGQ~w(aS2iL)*HL>^Gt0ls6?~oyaFMgnr{3ekb@!^5
zJ%)EqEB8zliSk1;@x-Tg4?8~y&&4uw*)xsFFqbf$8}uXcnva=?^vI3*GXv6a8~FJb
ztUrx#%w9(+se<8R+QG2#KKL2@+FAmU1rR=7MMoAz+dn9`DB2J$ji?yJtb_ZYs)D_k
z)>5U-!zki)K7lgsmvOi>g?Lij%ZWRgCZoz!&<Q^BkYg_f&i1ym{ehgUbCGB&LMDe#
zj}M(r){@`O$3w4B1SmMLRv`HI@b3eD)pZ~xmpHIXF3D-D>8%kb2P9AOo9UsR9vbOk
z%LWxMARs{O*(=+hvkSy;LUFGS;O-FE0@xr2PykqK5Vuec0CMEyr0C_VNSQ;XLV3>U
z91tiFA1xKj;(~PmFTb(ybV@r$Fo1t{<`><?1)z2cZVsH%EgTiyY6Xes0h{1}TlT;T
x^F6pRHV5Td!@f~?2v(s{2Syu;FZ$lv(LUK*NAtRgAU0d=4D-~CR8$R^?JpSlq=5hc

diff --git a/js/src/jit-test/tests/debug/Frame-onPop-07.js b/js/src/jit-test/tests/debug/Frame-onPop-07.js
deleted file mode 100644
index bae4553e7b36..000000000000
--- a/js/src/jit-test/tests/debug/Frame-onPop-07.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Trying to set an onPop handler on a dead frame throws an exception.
-var g = newGlobal({newCompartment: true});
-g.eval("function f() { }");
-g.eval("function g() { f(); }");
-g.eval("function h() { g(); }");
-g.eval("function i() { h(); }");
-var dbg = new Debugger(g);
-var log;
-
-var frames = [];
-dbg.onEnterFrame = function handleEnter(f) {
-    log += "(";
-    assertEq(f.live, true);
-    frames.push(f);
-};
-log = '';
-g.i();
-assertEq(log, "((((");
-assertEq(frames.length, 4);
-for (i = 0; i < frames.length; i++) {
-    assertEq(frames[i].live, false);
-    var set = false;
-    try {
-        frames[i].onPop = function unappreciated() { };
-        set = true; // don't assert in a 'try' block
-    } catch (x) {
-        assertEq(x instanceof Error, true);
-    }
-    assertEq(set, false);
-}
diff --git a/js/src/jit-test/tests/debug/Frame-onPop-assign-function.js b/js/src/jit-test/tests/debug/Frame-onPop-assign-function.js
new file mode 100644
index 000000000000..f68d2a638b92
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-onPop-assign-function.js
@@ -0,0 +1,48 @@
+// Changing onPop while the function is dead is allowed.
+
+load(libdir + "asserts.js");
+
+const g = newGlobal({ newCompartment: true });
+const dbg = new Debugger(g);
+
+let steps = new Set();
+dbg.onDebuggerStatement = function(frame) {
+  // Setting 'onPop' while alive is allowed.
+  steps.add("debugger 1");
+  assertEq(frame.live, true);
+  frame.onPop = function() {
+    steps.add("onpop 1");
+  };
+
+  dbg.onDebuggerStatement = function() {
+    // Clear the 'onPop' while dead.
+    steps.add("debugger 2");
+    assertEq(frame.live, false);
+
+    // Clearing 'onPop' while dead is allowed.
+    frame.onPop = undefined;
+
+      // Setting 'onPop' while dead is allowed.
+    frame.onPop = function() {
+      steps.add("onpop 2");
+    };
+  };
+};
+
+g.eval(
+  `
+    function myGen() {
+      debugger;
+    }
+
+    const g = myGen();
+
+    debugger;
+  `
+);
+
+assertDeepEq(Array.from(steps), [
+  "debugger 1",
+  "onpop 1",
+  "debugger 2",
+]);
diff --git a/js/src/jit-test/tests/debug/Frame-onPop-assign-generator.js b/js/src/jit-test/tests/debug/Frame-onPop-assign-generator.js
new file mode 100644
index 000000000000..411ac8f58331
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-onPop-assign-generator.js
@@ -0,0 +1,68 @@
+// Changing onPop while the generator is suspended/dead is allowed.
+
+load(libdir + "asserts.js");
+
+const g = newGlobal({ newCompartment: true });
+const dbg = new Debugger(g);
+
+let steps = new Set();
+dbg.onDebuggerStatement = function(frame) {
+  // Setting 'onStep' while alive is allowed.
+  steps.add("debugger 1");
+  assertEq(frame.live, true);
+  frame.onPop = function() {
+    steps.add("onpop 1");
+  };
+
+  dbg.onDebuggerStatement = function() {
+    // Clear the 'onPop' while suspended.
+    steps.add("debugger 2");
+    assertEq(frame.live, false);
+
+    // Clearing 'onPop' while suspended is allowed.
+    frame.onPop = undefined;
+
+      // Setting 'onPop' while suspended is allowed.
+    frame.onPop = function() {
+      steps.add("onpop 2");
+    };
+
+    dbg.onDebuggerStatement = function() {
+      steps.add("debugger 3");
+      assertEq(frame.live, false);
+
+      // Clearing 'onPop' while dead is allowed.
+      frame.onPop = undefined;
+
+        // Setting 'onPop' while dead is allowed.
+      frame.onPop = function() {
+        steps.add("onpop 3");
+      };
+    };
+  };
+};
+
+g.eval(
+  `
+    function* myGen() {
+      debugger;
+      yield;
+    }
+
+    const g = myGen();
+    g.next();
+
+    debugger;
+    g.next();
+
+    debugger;
+  `
+);
+
+assertDeepEq(Array.from(steps), [
+  "debugger 1",
+  "onpop 1",
+  "debugger 2",
+  "onpop 2",
+  "debugger 3",
+]);