diff -r 000000000000 -r 6474c204b198 js/src/jit-test/tests/baseline/bug842431-3.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit-test/tests/baseline/bug842431-3.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,24 @@
+// |jit-test|
+
+// If an exception unwind hook performs a forced return, and this calls an
+// onPop handler that throws, the exception should not be handled in the
+// current frame but propagated to the caller.
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+g.eval('function f() { try { var y; throw 123; } catch(e) { assertEq(0, 1); } }');
+
+dbg.onExceptionUnwind = function(frame) {
+    frame.onPop = function() {
+	return {throw: 321};
+    }
+
+    return {return: 11};
+};
+
+try {
+    g.f();
+    assertEq(0, 1);
+} catch(e) {
+    assertEq(e.toString().contains("321"), true);
+}