1 files changed, 43 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/debug/noExecute-04.js b/js/src/jit-test/tests/debug/noExecute-04.js
new file mode 100644
index 000000000..f769f04d8
--- /dev/null
+++ b/js/src/jit-test/tests/debug/noExecute-04.js
@@ -0,0 +1,43 @@
+// Tests that NX works through the enabled toggle and adding/removing the
+// global.
+
+load(libdir + "asserts.js");
+load(libdir + "debuggerNXHelper.js");
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+g.eval(`
+       function f() { }
+       var o = {
+         get p() { },
+         set p(x) { }
+       };
+       `);
+
+var handlers = [() => { g.f(); },
+                () => { g.o.p } ,
+                () => { g.o.p = 42; }];
+
+function testHookEnabled(hookName, trigger) {
+  for (var h of handlers) {
+    assertThrowsInstanceOf(h, Debugger.DebuggeeWouldRun);
+    dbg.enabled = false;
+    h();
+    dbg.enabled = true;
+    assertThrowsInstanceOf(h, Debugger.DebuggeeWouldRun);
+  }
+}
+
+function testHookRemoval(hookName, trigger) {
+  for (var h of handlers) {
+    assertThrowsInstanceOf(h, Debugger.DebuggeeWouldRun);
+    dbg.removeDebuggee(g);
+    h();
+    dbg.addDebuggee(g);
+    assertThrowsInstanceOf(h, Debugger.DebuggeeWouldRun);
+  }
+}
+
+testDebuggerHooksNX(dbg, g, testHookEnabled);
+testDebuggerHooksNX(dbg, g, testHookRemoval);