From 1a5dc40c66fd250636f7c7be2dc3ba03dcb67c9c Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Tue, 29 Apr 2014 21:57:36 -0700
Subject: [PATCH] Bug 1001368 - Tests. (r=jimb)

---
 .../Frame-onPop-error-scope-unwind-01.js      | 32 +++++++++++++++++
 .../Frame-onPop-error-scope-unwind-02.js      | 35 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-01.js
 create mode 100644 js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-02.js

diff --git a/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-01.js b/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-01.js
new file mode 100644
index 00000000000..08d2bd56d74
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-01.js
@@ -0,0 +1,32 @@
+// Tests that exception handling works with block scopes.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var correct;
+dbg.onEnterFrame = function (f) {
+  if (f.callee && f.callee.name == "f") {
+    f.onPop = function() {
+      // The scope at the point of onPop is the outermost.
+      correct = (f.environment.getVariable("e") === undefined &&
+                 f.environment.getVariable("outer") === 43);
+    };
+  }
+};
+g.eval("" + function f() {
+  var outer = 43;
+  try {
+    eval("");
+    throw 42;
+  } catch (e) {
+    noSuchFn(e);
+  }
+});
+
+
+try {
+  g.eval("f();");
+} catch (e) {
+  // The above is expected to throw.
+}
+
+assertEq(correct, true);
diff --git a/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-02.js b/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-02.js
new file mode 100644
index 00000000000..5938f1bb477
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-02.js
@@ -0,0 +1,35 @@
+// Tests that exception handling works with block scopes.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var correct;
+dbg.onEnterFrame = function (f) {
+  if (f.callee && f.callee.name == "f") {
+    f.onPop = function() {
+      // The scope at the point of onPop is the outermost.
+      correct = (f.environment.getVariable("e") === undefined &&
+                 f.environment.getVariable("outer") === 43);
+    };
+  }
+};
+g.eval("" + function f() {
+  var outer = 43;
+  // Surround with a loop to insert a loop trynote.
+  for (;;) {
+    try {
+      eval("");
+      throw 42;
+    } catch (e) {
+      noSuchFn(e);
+    }
+  }
+});
+
+
+try {
+  g.eval("f();");
+} catch (e) {
+  // The above is expected to throw.
+}
+
+assertEq(correct, true);