diff -r 000000000000 -r 6474c204b198 js/src/jit-test/tests/debug/Frame-eval-16.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit-test/tests/debug/Frame-eval-16.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,26 @@
+// eval correctly handles optional custom url option
+var g = newGlobal();
+var dbg = new Debugger(g);
+var count = 0;
+
+function testUrl (options, expected) {
+    count++;
+    dbg.onDebuggerStatement = function (frame) {
+        dbg.onNewScript = function (script) {
+            dbg.onNewScript = undefined;
+            assertEq(script.url, expected);
+            count--;
+        };
+        frame.eval("", options);
+    };
+    g.eval("debugger;");
+}
+
+
+testUrl(undefined, "debugger eval code");
+testUrl(null, "debugger eval code");
+testUrl({ url: undefined }, "debugger eval code");
+testUrl({ url: null }, "null");
+testUrl({ url: 5 }, "5");
+testUrl({ url: "test" }, "test");
+assertEq(count, 0);