Backed out 3 changesets (bug 1230194) for devtools failures in browser_dbg_worker-console-02.js on a CLOSED TREE
authorOana Pop Rus <opoprus@mozilla.com>
Tue, 07 May 2019 06:32:29 +0300
changeset 534726 84810c2018def430bc45f54c024d84567e7cee2b
parent 534725 4b84f663a807b7fb7429691f254b566e314e0bfe
child 534727 c64f610ccf7669b35c1a02cd03b35dd5949c8e53
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1230194
milestone68.0a1
backs oute9a1fd460a24faaf398fc4bc3cabb31bb80b85e2
624da9352fd94df3517ba805863d3c0d5d6b85db
155bf8609915ef53445855b485668af718a77b3e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 3 changesets (bug 1230194) for devtools failures in browser_dbg_worker-console-02.js on a CLOSED TREE Backed out changeset e9a1fd460a24 (bug 1230194) Backed out changeset 624da9352fd9 (bug 1230194) Backed out changeset 155bf8609915 (bug 1230194)
devtools/client/webconsole/components/message-types/EvaluationResult.js
devtools/client/webconsole/test/fixtures/stub-generators/head.js
devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js
devtools/client/webconsole/test/mochitest/browser.ini
devtools/client/webconsole/test/mochitest/browser_webconsole_eval_error.js
devtools/client/webconsole/test/mochitest/head.js
devtools/client/webconsole/test/mochitest/test-eval-error.html
devtools/client/webconsole/utils/messages.js
devtools/server/actors/webconsole.js
devtools/server/actors/webconsole/utils.js
devtools/shared/specs/webconsole.js
js/src/doc/Debugger/Conventions.md
js/src/jit-test/tests/binast/lazy/debug/Object-apply-01.binjs
js/src/jit-test/tests/binast/nonlazy/debug/Object-apply-01.binjs
js/src/jit-test/tests/debug/Frame-live-07.js
js/src/jit-test/tests/debug/Object-apply-01.js
js/src/jit-test/tests/debug/onExceptionUnwind-resumption-05.js
js/src/jit-test/tests/debug/resumption-09.js
js/src/vm/Debugger.cpp
js/src/vm/Debugger.h
--- a/devtools/client/webconsole/components/message-types/EvaluationResult.js
+++ b/devtools/client/webconsole/components/message-types/EvaluationResult.js
@@ -15,42 +15,35 @@ const GripMessageBody = require("devtool
 EvaluationResult.displayName = "EvaluationResult";
 
 EvaluationResult.propTypes = {
   dispatch: PropTypes.func.isRequired,
   message: PropTypes.object.isRequired,
   timestampsVisible: PropTypes.bool.isRequired,
   serviceContainer: PropTypes.object,
   maybeScrollToBottom: PropTypes.func,
-  open: PropTypes.bool,
-};
-
-EvaluationResult.defaultProps = {
-  open: false,
 };
 
 function EvaluationResult(props) {
   const {
     dispatch,
     message,
     serviceContainer,
     timestampsVisible,
     maybeScrollToBottom,
-    open,
   } = props;
 
   const {
     source,
     type,
     helperType,
     level,
     id: messageId,
     indent,
     exceptionDocURL,
-    stacktrace,
     frame,
     timeStamp,
     parameters,
     notes,
   } = message;
 
   let messageBody;
   if (typeof message.messageText !== "undefined" && message.messageText !== null) {
@@ -74,29 +67,25 @@ function EvaluationResult(props) {
       helperType,
       maybeScrollToBottom,
     });
   }
 
   const topLevelClasses = ["cm-s-mozilla"];
 
   return Message({
-    dispatch,
     source,
     type,
     level,
     indent,
     topLevelClasses,
     messageBody,
     messageId,
     serviceContainer,
     exceptionDocURL,
-    stacktrace,
-    collapsible: Array.isArray(stacktrace),
-    open,
     frame,
     timeStamp,
     parameters,
     notes,
     timestampsVisible,
     maybeScrollToBottom,
   });
 }
--- a/devtools/client/webconsole/test/fixtures/stub-generators/head.js
+++ b/devtools/client/webconsole/test/fixtures/stub-generators/head.js
@@ -198,30 +198,16 @@ function getCleanedPacket(key, packet) {
           if (frame && existingFrame && frame.sourceId) {
             frame.sourceId = existingFrame.sourceId;
           }
           return frame;
         });
       }
     }
 
-    if (Array.isArray(res.exceptionStack)) {
-      res.exceptionStack = res.exceptionStack.map((frame, i) => {
-        const existingFrame = existingPacket.exceptionStack[i];
-        if (frame && existingFrame && frame.sourceId) {
-          frame.sourceId = existingFrame.sourceId;
-        }
-        return frame;
-      });
-    }
-
-    if (res.frame && existingPacket.frame) {
-      res.frame.sourceId = existingPacket.frame.sourceId;
-    }
-
     if (res.packet) {
       const override = {};
       const keys = ["totalTime", "from", "contentSize", "transferredSize"];
       keys.forEach(x => {
         if (res.packet[x] !== undefined) {
           override[x] = existingPacket.packet[key];
         }
       });
--- a/devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js
@@ -32,17 +32,18 @@ stubPreparedMessages.set(`new Date(0)`, 
       "frozen": false,
       "sealed": false,
       "ownPropertyLength": 0,
       "preview": {
         "timestamp": 0
       }
     }
   ],
-  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"log\",\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj30\",\"class\":\"Date\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"timestamp\":0}}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null}",
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"log\",\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj30\",\"class\":\"Date\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"timestamp\":0}}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
   "frame": null,
   "groupId": null,
   "cssSelectors": "",
   "userProvidedStyles": null,
   "notes": null,
   "indent": 0,
   "prefix": "",
   "chromeContext": false
@@ -59,26 +60,18 @@ stubPreparedMessages.set(`asdf()`, new C
   "level": "error",
   "category": null,
   "messageText": "ReferenceError: asdf is not defined",
   "parameters": [
     {
       "type": "undefined"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":[{\"filename\":\"debugger eval code\",\"sourceId\":\"server1.conn0.child1/source23\",\"lineNumber\":1,\"columnNumber\":1,\"functionName\":null}]}",
-  "stacktrace": [
-    {
-      "filename": "debugger eval code",
-      "sourceId": "server1.conn0.child1/source23",
-      "lineNumber": 1,
-      "columnNumber": 1,
-      "functionName": null
-    }
-  ],
+  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
   "frame": {
     "source": "debugger eval code",
     "line": 1,
     "column": 1
   },
   "groupId": null,
   "errorMessageName": "JSMSG_NOT_DEFINED",
   "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
@@ -101,61 +94,18 @@ stubPreparedMessages.set(`1 + @`, new Co
   "level": "error",
   "category": null,
   "messageText": "SyntaxError: illegal character",
   "parameters": [
     {
       "type": "undefined"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":4},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: illegal character\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":[{\"filename\":\"resource://devtools/server/actors/webconsole/eval-with-debugger.js\",\"sourceId\":null,\"lineNumber\":134,\"columnNumber\":28,\"functionName\":\"getEvalResult\"},{\"filename\":\"resource://devtools/server/actors/webconsole/eval-with-debugger.js\",\"sourceId\":null,\"lineNumber\":105,\"columnNumber\":18,\"functionName\":\"exports.evalWithDebugger\"},{\"filename\":\"resource://devtools/server/actors/webconsole.js\",\"sourceId\":null,\"lineNumber\":1005,\"columnNumber\":22,\"functionName\":\"evaluateJS\"},{\"filename\":\"self-hosted\",\"sourceId\":null,\"lineNumber\":1005,\"columnNumber\":17,\"functionName\":\"evaluateJS\"},{\"filename\":\"resource://devtools/server/main.js\",\"sourceId\":null,\"lineNumber\":1291,\"columnNumber\":58,\"functionName\":\"onPacket\"},{\"filename\":\"resource://devtools/shared/transport/child-transport.js\",\"sourceId\":null,\"lineNumber\":66,\"columnNumber\":16,\"functionName\":\"receiveMessage\"}]}",
-  "stacktrace": [
-    {
-      "filename": "resource://devtools/server/actors/webconsole/eval-with-debugger.js",
-      "sourceId": null,
-      "lineNumber": 134,
-      "columnNumber": 28,
-      "functionName": "getEvalResult"
-    },
-    {
-      "filename": "resource://devtools/server/actors/webconsole/eval-with-debugger.js",
-      "sourceId": null,
-      "lineNumber": 105,
-      "columnNumber": 18,
-      "functionName": "exports.evalWithDebugger"
-    },
-    {
-      "filename": "resource://devtools/server/actors/webconsole.js",
-      "sourceId": null,
-      "lineNumber": 1005,
-      "columnNumber": 22,
-      "functionName": "evaluateJS"
-    },
-    {
-      "filename": "self-hosted",
-      "sourceId": null,
-      "lineNumber": 1005,
-      "columnNumber": 17,
-      "functionName": "evaluateJS"
-    },
-    {
-      "filename": "resource://devtools/server/main.js",
-      "sourceId": null,
-      "lineNumber": 1291,
-      "columnNumber": 58,
-      "functionName": "onPacket"
-    },
-    {
-      "filename": "resource://devtools/shared/transport/child-transport.js",
-      "sourceId": null,
-      "lineNumber": 66,
-      "columnNumber": 16,
-      "functionName": "receiveMessage"
-    }
-  ],
+  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":4},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: illegal character\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
   "frame": {
     "source": "debugger eval code",
     "line": 1,
     "column": 4
   },
   "groupId": null,
   "errorMessageName": "JSMSG_ILLEGAL_CHARACTER",
   "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Illegal_character?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
@@ -198,17 +148,18 @@ stubPreparedMessages.set(`inspect({a: 1}
         },
         "ownSymbols": [],
         "ownPropertiesLength": 1,
         "ownSymbolsLength": 0,
         "safeGetterValues": {}
       }
     }
   ],
-  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"log\",\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj35\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"a\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":1}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null}",
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"log\",\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj35\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"a\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":1}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
   "frame": null,
   "groupId": null,
   "cssSelectors": "",
   "userProvidedStyles": null,
   "notes": null,
   "indent": 0,
   "prefix": "",
   "chromeContext": false
@@ -225,17 +176,18 @@ stubPreparedMessages.set(`cd(document)`,
   "level": "error",
   "category": null,
   "messageText": "Cannot cd() to the given window. Invalid argument.",
   "parameters": [
     {
       "type": "undefined"
     }
   ],
-  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"Cannot cd() to the given window. Invalid argument.\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null}",
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"Cannot cd() to the given window. Invalid argument.\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
   "frame": null,
   "groupId": null,
   "cssSelectors": "",
   "userProvidedStyles": null,
   "notes": null,
   "indent": 0,
   "prefix": "",
   "chromeContext": false
@@ -251,17 +203,18 @@ stubPreparedMessages.set(`undefined`, ne
   "helperType": null,
   "level": "log",
   "category": null,
   "parameters": [
     {
       "type": "undefined"
     }
   ],
-  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"log\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null}",
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"log\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
   "frame": null,
   "groupId": null,
   "cssSelectors": "",
   "userProvidedStyles": null,
   "notes": null,
   "indent": 0,
   "prefix": "",
   "chromeContext": false
@@ -283,32 +236,19 @@ stubPreparedMessages.set(`longString mes
     "length": 110007,
     "actor": "server1.conn0.child1/longString37"
   },
   "parameters": [
     {
       "type": "undefined"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"sourceId\":\"server1.conn0.child1/source30\",\"line\":1,\"column\":7},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":{\"type\":\"longString\",\"initial\":\"Error: Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Lon\",\"length\":110007,\"actor\":\"server1.conn0.child1/longString37\"},\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":[{\"filename\":\"debugger eval code\",\"sourceId\":\"server1.conn0.child1/source30\",\"lineNumber\":1,\"columnNumber\":7,\"functionName\":null}]}",
-  "stacktrace": [
-    {
-      "filename": "debugger eval code",
-      "sourceId": "server1.conn0.child1/source30",
-      "lineNumber": 1,
-      "columnNumber": 7,
-      "functionName": null
-    }
-  ],
-  "frame": {
-    "source": "debugger eval code",
-    "sourceId": "server1.conn0.child1/source30",
-    "line": 1,
-    "column": 7
-  },
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":{\"type\":\"longString\",\"initial\":\"Error: Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Lon\",\"length\":110007,\"actor\":\"server1.conn0.child1/longString37\"},\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
+  "frame": null,
   "groupId": null,
   "cssSelectors": "",
   "userProvidedStyles": null,
   "notes": null,
   "indent": 0,
   "prefix": "",
   "chromeContext": false
 }));
@@ -324,32 +264,19 @@ stubPreparedMessages.set(`eval throw ""`
   "level": "error",
   "category": null,
   "messageText": "Error",
   "parameters": [
     {
       "type": "undefined"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"sourceId\":\"server1.conn0.child1/source23\",\"line\":1,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"Error\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":[{\"filename\":\"debugger eval code\",\"sourceId\":\"server1.conn0.child1/source23\",\"lineNumber\":1,\"columnNumber\":1,\"functionName\":null}]}",
-  "stacktrace": [
-    {
-      "filename": "debugger eval code",
-      "sourceId": "server1.conn0.child1/source23",
-      "lineNumber": 1,
-      "columnNumber": 1,
-      "functionName": null
-    }
-  ],
-  "frame": {
-    "source": "debugger eval code",
-    "sourceId": "server1.conn0.child1/source23",
-    "line": 1,
-    "column": 1
-  },
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"Error\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
+  "frame": null,
   "groupId": null,
   "cssSelectors": "",
   "userProvidedStyles": null,
   "notes": null,
   "indent": 0,
   "prefix": "",
   "chromeContext": false
 }));
@@ -365,32 +292,19 @@ stubPreparedMessages.set(`eval throw "to
   "level": "error",
   "category": null,
   "messageText": "Error: tomato",
   "parameters": [
     {
       "type": "undefined"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"sourceId\":\"server1.conn0.child1/source23\",\"line\":1,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"Error: tomato\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":[{\"filename\":\"debugger eval code\",\"sourceId\":\"server1.conn0.child1/source23\",\"lineNumber\":1,\"columnNumber\":1,\"functionName\":null}]}",
-  "stacktrace": [
-    {
-      "filename": "debugger eval code",
-      "sourceId": "server1.conn0.child1/source23",
-      "lineNumber": 1,
-      "columnNumber": 1,
-      "functionName": null
-    }
-  ],
-  "frame": {
-    "source": "debugger eval code",
-    "sourceId": "server1.conn0.child1/source23",
-    "line": 1,
-    "column": 1
-  },
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"Error: tomato\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",
+  "stacktrace": null,
+  "frame": null,
   "groupId": null,
   "cssSelectors": "",
   "userProvidedStyles": null,
   "notes": null,
   "indent": 0,
   "prefix": "",
   "chromeContext": false
 }));
@@ -439,25 +353,16 @@ stubPackets.set(`asdf()`, {
       "stack": "@debugger eval code:1:1\n",
       "fileName": "debugger eval code",
       "lineNumber": 1,
       "columnNumber": 1
     }
   },
   "exceptionMessage": "ReferenceError: asdf is not defined",
   "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
-  "exceptionStack": [
-    {
-      "filename": "debugger eval code",
-      "sourceId": "server1.conn0.child1/source23",
-      "lineNumber": 1,
-      "columnNumber": 1,
-      "functionName": null
-    }
-  ],
   "errorMessageName": "JSMSG_NOT_DEFINED",
   "frame": {
     "source": "debugger eval code",
     "line": 1,
     "column": 1
   },
   "helperResult": null,
   "notes": null
@@ -485,60 +390,16 @@ stubPackets.set(`1 + @`, {
       "stack": "",
       "fileName": "debugger eval code",
       "lineNumber": 1,
       "columnNumber": 4
     }
   },
   "exceptionMessage": "SyntaxError: illegal character",
   "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Illegal_character?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
-  "exceptionStack": [
-    {
-      "filename": "resource://devtools/server/actors/webconsole/eval-with-debugger.js",
-      "sourceId": null,
-      "lineNumber": 134,
-      "columnNumber": 28,
-      "functionName": "getEvalResult"
-    },
-    {
-      "filename": "resource://devtools/server/actors/webconsole/eval-with-debugger.js",
-      "sourceId": null,
-      "lineNumber": 105,
-      "columnNumber": 18,
-      "functionName": "exports.evalWithDebugger"
-    },
-    {
-      "filename": "resource://devtools/server/actors/webconsole.js",
-      "sourceId": null,
-      "lineNumber": 1005,
-      "columnNumber": 22,
-      "functionName": "evaluateJS"
-    },
-    {
-      "filename": "self-hosted",
-      "sourceId": null,
-      "lineNumber": 1005,
-      "columnNumber": 17,
-      "functionName": "evaluateJS"
-    },
-    {
-      "filename": "resource://devtools/server/main.js",
-      "sourceId": null,
-      "lineNumber": 1291,
-      "columnNumber": 58,
-      "functionName": "onPacket"
-    },
-    {
-      "filename": "resource://devtools/shared/transport/child-transport.js",
-      "sourceId": null,
-      "lineNumber": 66,
-      "columnNumber": 16,
-      "functionName": "receiveMessage"
-    }
-  ],
   "errorMessageName": "JSMSG_ILLEGAL_CHARACTER",
   "frame": {
     "source": "debugger eval code",
     "line": 1,
     "column": 4
   },
   "helperResult": null,
   "notes": null
@@ -644,87 +505,45 @@ stubPackets.set(`longString message Erro
     }
   },
   "exceptionMessage": {
     "type": "longString",
     "initial": "Error: Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Lon",
     "length": 110007,
     "actor": "server1.conn0.child1/longString37"
   },
-  "exceptionStack": [
-    {
-      "filename": "debugger eval code",
-      "sourceId": "server1.conn0.child1/source30",
-      "lineNumber": 1,
-      "columnNumber": 7,
-      "functionName": null
-    }
-  ],
-  "frame": {
-    "source": "debugger eval code",
-    "sourceId": "server1.conn0.child1/source30",
-    "line": 1,
-    "column": 7
-  },
+  "frame": null,
   "helperResult": null,
   "notes": null
 });
 
 stubPackets.set(`eval throw ""`, {
   "from": "server1.conn0.child1/consoleActor2",
   "input": "throw \"\"",
   "result": {
     "type": "undefined"
   },
   "timestamp": 1517990289517,
   "exception": "",
   "exceptionMessage": "",
-  "exceptionStack": [
-    {
-      "filename": "debugger eval code",
-      "sourceId": "server1.conn0.child1/source23",
-      "lineNumber": 1,
-      "columnNumber": 1,
-      "functionName": null
-    }
-  ],
-  "frame": {
-    "source": "debugger eval code",
-    "sourceId": "server1.conn0.child1/source23",
-    "line": 1,
-    "column": 1
-  },
+  "frame": null,
   "helperResult": null,
   "notes": null
 });
 
 stubPackets.set(`eval throw "tomato"`, {
   "from": "server1.conn0.child1/consoleActor2",
   "input": "throw \"tomato\"",
   "result": {
     "type": "undefined"
   },
   "timestamp": 1517990289520,
   "exception": "tomato",
   "exceptionMessage": "tomato",
-  "exceptionStack": [
-    {
-      "filename": "debugger eval code",
-      "sourceId": "server1.conn0.child1/source23",
-      "lineNumber": 1,
-      "columnNumber": 1,
-      "functionName": null
-    }
-  ],
-  "frame": {
-    "source": "debugger eval code",
-    "sourceId": "server1.conn0.child1/source23",
-    "line": 1,
-    "column": 1
-  },
+  "frame": null,
   "helperResult": null,
   "notes": null
 });
 
 module.exports = {
   stubPreparedMessages,
   stubPackets,
 };
--- a/devtools/client/webconsole/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -43,17 +43,16 @@ support-files =
   test-data.json^headers^
   test-duplicate-error.html
   test-dynamic-import.html
   test-dynamic-import.js
   test-error.html
   test-error-worker.html
   test-error-worker.js
   test-error-worker2.js
-  test-eval-error.html
   test-eval-in-stackframe.html
   test-eval-sources.html
   test-evaluate-worker.html
   test-evaluate-worker.js
   test-external-script-errors.html
   test-external-script-errors.js
   test-iframe-insecure-form-action.html
   test-iframe1.html
@@ -292,17 +291,16 @@ tags = clipboard
 [browser_webconsole_csp_violation.js]
 [browser_webconsole_cspro.js]
 [browser_webconsole_document_focus.js]
 [browser_webconsole_duplicate_errors.js]
 [browser_webconsole_error_with_grouped_stack.js]
 [browser_webconsole_error_with_longstring_stack.js]
 [browser_webconsole_error_with_unicode.js]
 [browser_webconsole_errors_after_page_reload.js]
-[browser_webconsole_eval_error.js]
 [browser_webconsole_eval_in_debugger_stackframe.js]
 [browser_webconsole_eval_in_debugger_stackframe2.js]
 [browser_webconsole_eval_sources.js]
 [browser_webconsole_execution_scope.js]
 [browser_webconsole_external_script_errors.js]
 [browser_webconsole_file_uri.js]
 skip-if = true #	Bug 1404382
 [browser_webconsole_filter_by_input.js]
deleted file mode 100644
--- a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_error.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests that throwing uncaught errors while doing console evaluations shows a
-// stack in the console.
-
-"use strict";
-
-const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "test/mochitest/test-eval-error.html";
-
-add_task(async function() {
-  const hud = await openNewTabAndConsole(TEST_URI);
-
-  hud.jsterm.execute("throwErrorObject()");
-  await checkMessageStack(hud, "ThrowErrorObject", [6, 1]);
-
-  hud.jsterm.execute("throwValue(40 + 2)");
-  await checkMessageStack(hud, "42", [14, 10, 1]);
-});
--- a/devtools/client/webconsole/test/mochitest/head.js
+++ b/devtools/client/webconsole/test/mochitest/head.js
@@ -1329,17 +1329,17 @@ function checkConsoleOutputForWarningGro
  *        message substring to look for
  * @param {Array<number>} frameLines
  *        line numbers of the frames expected in the stack
  */
 async function checkMessageStack(hud, text, frameLines) {
   const msgNode = await waitFor(() => findMessage(hud, text));
   ok(!msgNode.classList.contains("open"), `Error logged not expanded`);
 
-  const button = await waitFor(() => msgNode.querySelector(".collapse-button"));
+  const button = msgNode.querySelector(".collapse-button");
   button.click();
 
   const framesNode = await waitFor(() => msgNode.querySelector(".frames"));
   const frameNodes = framesNode.querySelectorAll(".frame");
   ok(frameNodes.length == frameLines.length, `Found ${frameLines.length} frames`);
   for (let i = 0; i < frameLines.length; i++) {
     ok(frameNodes[i].querySelector(".line").textContent == "" + frameLines[i],
        `Found line ${frameLines[i]} for frame #${i}`);
deleted file mode 100644
--- a/devtools/client/webconsole/test/mochitest/test-eval-error.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<script>
-/* eslint-disable no-unused-vars */
-"use strict";
-
-function throwErrorObject(value) {
-  throw new Error("ThrowErrorObject");
-}
-
-function throwValue(value) {
-  otherFunction(value);
-}
-
-function otherFunction(value) {
-  throw value;
-}
-</script>
--- a/devtools/client/webconsole/utils/messages.js
+++ b/devtools/client/webconsole/utils/messages.js
@@ -288,17 +288,16 @@ function transformNetworkEventPacket(pac
 }
 
 function transformEvaluationResultPacket(packet) {
   let {
     exceptionMessage,
     errorMessageName,
     exceptionDocURL,
     exception,
-    exceptionStack,
     frame,
     result,
     helperResult,
     timestamp: timeStamp,
     notes,
   } = packet;
 
   const parameter = helperResult && helperResult.object
@@ -324,17 +323,16 @@ function transformEvaluationResultPacket
     source: MESSAGE_SOURCE.JAVASCRIPT,
     type: MESSAGE_TYPE.RESULT,
     helperType: helperResult ? helperResult.type : null,
     level,
     messageText: exceptionMessage,
     parameters: [parameter],
     errorMessageName,
     exceptionDocURL,
-    stacktrace: exceptionStack,
     frame,
     timeStamp,
     notes,
     private: packet.private,
   });
 }
 
 // Helpers
--- a/devtools/server/actors/webconsole.js
+++ b/devtools/server/actors/webconsole.js
@@ -1005,17 +1005,17 @@ WebConsoleActor.prototype =
     const evalInfo = evalWithDebugger(input, evalOptions, this);
 
     this.parentActor.threadActor.insideClientEvaluation = false;
 
     const evalResult = evalInfo.result;
     const helperResult = evalInfo.helperResult;
 
     let result, errorDocURL, errorMessage, errorNotes = null, errorGrip = null,
-      frame = null, awaitResult, errorMessageName, exceptionStack;
+      frame = null, awaitResult, errorMessageName;
     if (evalResult) {
       if ("return" in evalResult) {
         result = evalResult.return;
         if (
           mapped &&
           mapped.await &&
           result &&
           result.class === "Promise" &&
@@ -1024,31 +1024,16 @@ WebConsoleActor.prototype =
           awaitResult = result.unsafeDereference();
         }
       } else if ("yield" in evalResult) {
         result = evalResult.yield;
       } else if ("throw" in evalResult) {
         const error = evalResult.throw;
         errorGrip = this.createValueGrip(error);
 
-        exceptionStack = this.prepareStackForRemote(evalResult.stack);
-
-        if (exceptionStack) {
-          // Set the frame based on the topmost stack frame for the exception.
-          const {
-            filename: source,
-            sourceId,
-            lineNumber: line,
-            columnNumber: column,
-          } = exceptionStack[0];
-          frame = { source, sourceId, line, column };
-
-          exceptionStack = WebConsoleUtils.removeFramesAboveDebuggerEval(exceptionStack);
-        }
-
         errorMessage = String(error);
         if (typeof error === "object" && error !== null) {
           try {
             errorMessage = DevToolsUtils.callPropertyOnObject(error, "toString");
           } catch (e) {
             // If the debuggee is not allowed to access the "toString" property
             // of the error object, calling this property from the debuggee's
             // compartment will fail. The debugger should show the error object
@@ -1142,17 +1127,16 @@ WebConsoleActor.prototype =
       from: this.actorID,
       input: input,
       result: resultGrip,
       awaitResult,
       timestamp: timestamp,
       exception: errorGrip,
       exceptionMessage: this._createStringGrip(errorMessage),
       exceptionDocURL: errorDocURL,
-      exceptionStack,
       errorMessageName,
       frame,
       helperResult: helperResult,
       notes: errorNotes,
     };
   },
 
   /**
@@ -1477,55 +1461,42 @@ WebConsoleActor.prototype =
   },
 
   getActorIdForInternalSourceId(id) {
     const actor = this.parentActor.sources.getSourceActorByInternalSourceId(id);
     return actor ? actor.actorID : null;
   },
 
   /**
-   * Prepare a SavedFrame stack to be sent to the client.
-   *
-   * @param SavedFrame errorStack
-   *        Stack for an error we need to send to the client.
-   * @return object
-   *         The object you can send to the remote client.
-   */
-  prepareStackForRemote(errorStack) {
-    // Convert stack objects to the JSON attributes expected by client code
-    // Bug 1348885: If the global from which this error came from has been
-    // nuked, stack is going to be a dead wrapper.
-    if (!errorStack || Cu.isDeadWrapper(errorStack)) {
-      return null;
-    }
-    const stack = [];
-    let s = errorStack;
-    while (s !== null) {
-      stack.push({
-        filename: s.source,
-        sourceId: this.getActorIdForInternalSourceId(s.sourceId),
-        lineNumber: s.line,
-        columnNumber: s.column,
-        functionName: s.functionDisplayName,
-      });
-      s = s.parent;
-    }
-    return stack;
-  },
-
-  /**
    * Prepare an nsIScriptError to be sent to the client.
    *
    * @param nsIScriptError pageError
    *        The page error we need to send to the client.
    * @return object
    *         The object you can send to the remote client.
    */
   preparePageErrorForRemote: function(pageError) {
-    const stack = this.prepareStackForRemote(pageError.stack);
+    let stack = null;
+    // Convert stack objects to the JSON attributes expected by client code
+    // Bug 1348885: If the global from which this error came from has been
+    // nuked, stack is going to be a dead wrapper.
+    if (pageError.stack && !Cu.isDeadWrapper(pageError.stack)) {
+      stack = [];
+      let s = pageError.stack;
+      while (s !== null) {
+        stack.push({
+          filename: s.source,
+          sourceId: this.getActorIdForInternalSourceId(s.sourceId),
+          lineNumber: s.line,
+          columnNumber: s.column,
+          functionName: s.functionDisplayName,
+        });
+        s = s.parent;
+      }
+    }
     let lineText = pageError.sourceLine;
     if (lineText && lineText.length > DebuggerServer.LONG_STRING_INITIAL_LENGTH) {
       lineText = lineText.substr(0, DebuggerServer.LONG_STRING_INITIAL_LENGTH);
     }
 
     let notesArray = null;
     const notes = pageError.notes;
     if (notes && notes.length) {
--- a/devtools/server/actors/webconsole/utils.js
+++ b/devtools/server/actors/webconsole/utils.js
@@ -188,39 +188,16 @@ var WebConsoleUtils = {
       case "function":
         return objectWrapper(value);
       default:
         console.error("Failed to provide a grip for value of " + typeof value
                       + ": " + value);
         return null;
     }
   },
-
-  /**
-   * Remove any frames in a stack that are above a debugger-triggered evaluation
-   * and will correspond with devtools server code, which we never want to show
-   * to the user.
-   *
-   * @param array stack
-   *        An array of frames, with the topmost first, and each of which has a
-   *        'filename' property.
-   * @return array
-   *         An array of stack frames with any devtools server frames removed.
-   *         The original array is not modified.
-   */
-  removeFramesAboveDebuggerEval(stack) {
-    // Remove any frames for server code above the debugger eval.
-    const evalIndex = stack.findIndex(({ filename }) => {
-      return filename == "debugger eval code";
-    });
-    if (evalIndex != -1) {
-      return stack.slice(0, evalIndex + 1);
-    }
-    return stack;
-  },
 };
 
 exports.WebConsoleUtils = WebConsoleUtils;
 
 /**
  * WebConsole commands manager.
  *
  * Defines a set of functions /variables ("commands") that are available from
--- a/devtools/shared/specs/webconsole.js
+++ b/devtools/shared/specs/webconsole.js
@@ -44,17 +44,16 @@ const webconsoleSpecPrototype = {
     evaluationResult: {
       resultID: Option(0, "string"),
       type: "evaluationResult",
       awaitResult: Option(0, "nullable:boolean"),
       errorMessageName: Option(0, "nullable:string"),
       exception: Option(0, "nullable:json"),
       exceptionMessage: Option(0, "nullable:string"),
       exceptionDocURL: Option(0, "nullable:string"),
-      exceptionStack: Option(0, "nullable:json"),
       frame: Option(0, "nullable:json"),
       helperResult: Option(0, "nullable:json"),
       input: Option(0, "nullable:string"),
       notes: Option(0, "nullable:string"),
       result: Option(0, "nullable:json"),
       timestamp: Option(0, "string"),
       topLevelAwaitRejected: Option(0, "nullable:boolean"),
     },
--- a/js/src/doc/Debugger/Conventions.md
+++ b/js/src/doc/Debugger/Conventions.md
@@ -71,20 +71,19 @@ of debuggee call initiated by the debugg
 interface provides a value describing how the code completed; these are
 called *completion values*. A completion value has one of the
 following forms:
 
 <code>{ return: <i>value</i> }</code>
 :   The code completed normally, returning <i>value</i>. <i>Value</i> is a
     debuggee value.
 
-<code>{ throw: <i>value</i>, stack: <i>stack</i> }</code>
+<code>{ throw: <i>value</i> }</code>
 :   The code threw <i>value</i> as an exception. <i>Value</i> is a debuggee
-    value.  <i>stack</i> is a `SavedFrame` representing the location from which
-    the value was thrown, and may be missing.
+    value.
 
 `null`
 :   The code was terminated, as if by the "slow script" dialog box.
 
 If control reaches the end of a generator frame, the completion value is
 <code>{ throw: <i>stop</i> }</code> where <i>stop</i> is a
 `Debugger.Object` object representing the `StopIteration` object being
 thrown.
@@ -104,21 +103,17 @@ resumption value has one of the followin
 <code>{ return: <i>value</i> }</code>
 :   Force the top frame of the debuggee to return <i>value</i> immediately,
     as if by executing a `return` statement. <i>Value</i> must be a debuggee
     value. (Most handler functions support this, except those whose
     descriptions say otherwise.) See the list of special cases below.
 
 <code>{ throw: <i>value</i> }</code>
 :   Throw <i>value</i> as an exception from the current bytecode
-    instruction. <i>Value</i> must be a debuggee value. Note that unlike
-    completion values, resumption values do not specify a stack.  When
-    initiating an exceptional return from a handler, the current debuggee stack
-    will be used. If a handler wants to avoid modifying the stack of an
-    already-thrown exception, it should return `undefined`.
+    instruction. <i>Value</i> must be a debuggee value.
 
 `null`
 :   Terminate the debuggee, as if it had been cancelled by the "slow script"
     dialog box.
 
 In some places, the JS language treats `return` statements specially or
 doesn't allow them at all. So there are a few special cases.
 
index e37e2bc3bd4726f5f83cedd9f56fefbdfa412c45..301fd6874f682bda79f6d78a980c44f3162f184e
GIT binary patch
literal 2114
zc$|Gx?QY^m6urz^mStHHvJgTMLRJ(ZmLP<pC`vc06i7%mQ9>f1t8JtH80-O@8k-#t
zp|t8_^kv$&=@aw?Ds^UTV}~>afoJZ=nKS2Hcdz?5L-cqx=-l0P20ywE@tMokr@!l$
zwQISVxP<n8UQiN-Zs3>CvFD}R#*ks=+IM6=&Q?{^r6?eC4%EDL8KKx4GV1!%w4fEo
z`^!0@uAL_8n?&}+y{_v!93UkJ_49y-7*FC%VWmSUUZ?w7CkzQ?#JM20hbeLTcuuOH
zF?I3SBT*0wkp1mgKpRQ#1K-aHr!};L1+kJa?}!4I0i9!SQxzUvE`3{oraU-V#;J#m
zTl~xVb=tZgKM|XyfwRroK^R|hgD<Wi?&VH>A#vJtlm<tbP6<opYMlr3#ggM~o0b^S
z4FZqg45gE-$=krzcMFF*oK_zue1|r57wpOl#@uwN4z~`|j3uQD%<u!{DazKZM2mZR
zN7yWI5}}$|p)x*IW4;N15M#GbRw=#_QFt7V2G{+oVLII_^#^6*tIwF`v1Hr(s@Tu^
zM95lLhJ3s_i-ot=vG~_)KJo@7Y)O4I)n+aWjmRX`8Ba~F!cxc)YUCMvniqsbV<cp#
zp*;nzul+>UVO0<xFQ-#JILZ5<92}^9+&4$-1?f@Bhb*Epn$chtUi%@#zD@2Y#*BDg
zV5xymbS82tTLt<mpq`UYKnqc8*nA2N!IqFOliDPf%&NV&ezhY0)`o4<BmR`lPOabG
zpWbAPal;yC8>|CsEUVg?Dsf8*D;Zf6S#Y#TPh`%C+3{qVPYU;m1&rVJeo~C?Brjoj
z?$~iD7Y;jRpRB}qV#)+blW(K>F&9ZQI(QrndcD-ke~gP`tyn_2qRD>+{<9DOm@0w?
zbn*rI+F1#q-5nFb2vyOC_MnwhkpgBJX`f`K)P;`-Ot~)T5P!}9b~w^I<0F(&4fGu3
zEVQHND*%RCKZH_kA0Ut5PjwGug$A-h%U6^lKfDMi2W1HgO$D^w4YG`>Cg_|67>ZF)
z;?!O{UbNaGwWAuZ6C7Dl5dT84ia^~*+Mbq=gHXKTA^!L*0}815xbK^`T5r5KQajW>
z#D|FG+pq#fyN#9^05wMb``dU?NH~5Uk=Km>sYrO0+OL2?b|WJXjhDG70a3iA2=xIz
z3Gs#SAdErj6|0aSRRNlrj@!37i~=u}Es7y~j-cKsB%^YX_56=lmIEjmwlDpT^ghx~
zwi7~o9!|u7_RAx?*(3jYW6COg*mXHkmA9v?k_cPj!v2@l$BEU)9Ak^dCC^z%yfoqg
KvJwg#1OElQ%lS(H
index f5e5b671c4484b3f62059cbe43cd697dc6fb9d04..5906df8924bae15fc2979baf38563fd7db350ed6
GIT binary patch
literal 2108
zc$|$>@oVBp6n-5-7$g)4B2q*`DdJiYDW&wbOHXZWuVrhCdduFG{b5W-O)n<iWUMF0
z{UP^99^9XBGn2$bd%LWnPTu$4H{bi-vwPRSAEM{mLFeJ2Gx*{<)aNc=U;LfBsoklE
ziA!1Uj|HP)=mviIig;f7*cfucUHgH~$JwlEdXx!tE{K{RT}~PChMc+nG)-v5@&0m7
znQNy&eFJ1~JnXu@BM4G)P`?U9hzpQp5-T0X$U1$lb;6J`PMvFNdxTM^Pv*4xi7=Op
zJsJgxBstoR1+0<OK8fc!6|#nQu%K2F78Oz8CSY^oZL-2<k4!1MS^BnQPQ{$Q4T&bW
zXeqQF$1l|8DR8;DJP6}1Hy6krWMl5smmX&>NP{E7rj)0CwXTBsVk!7`r<P2j8w4ID
z8ENO)Den?nKQA0H;xzjt(L1!6yWqE8Fcwo+_K4XLmYGTEnsD;O1jP8dwdGZ2Agv_!
z$Q~%41x{jBH5QyONH-4pbd_FUL>iulqrqMOc9`z>O8-@x`1&hhd7|X@e%I{R+(i0X
zScYQ3I*Wz3&Jp>IZL#zQqkPGHG{rNQhek9d-5F0!VZ&1T5n}pEJnRJ_#hiv5HSkN|
z`uI1x4y&@G@p39U-25Z7<72%~`sQf8pgqRKnnhAZGZw7EJ3r*ax9Q`=m{HFQEIsgP
zj!R7Et01=unCIjZ(n3@kHeW(Rs-^Vvq&A6tvuf|GKdnf=wNcyjs6XYi3+u0U7x&p@
z(y+$a0_)fstE_e=OLnPfl_G1R5>7YpL}5;>PJm^xDq>DN;G)~dNiph4HDP$}*m0RK
zjyPqXuH=3a#-&J8JVpy-E|Ow&{5%@;dg(0xF|N;Wv4r-DruY=Z$3g&L>Ik0D`Df_k
z%MwBd`zC@Bs-pMpL2FM(8kl8-e^N-P3m*`e>RiY{{Q3Z}FPJW&jB1eEgFOrF=kgT*
zL$9AesdfmEM{ooR$DnYWuV_VaaS_lSlocT~HNXcORu$7t$O#2tXhuPcp~H53XtgD@
zuN!Xx!K`UWyrEb{pdTT8i1Tp}iuWQUem<#y26{fO`=PDZ8(UZ66Z}5DL>|9RD_QWz
z=$IkUW9EN<j1PrG<1dkTY<wdl(N$`{AqG{Aj65{9u?T=D-qNJ^puCs9gPaOVJFG%N
zR0U{$M}bignW{oFRLLpS8--*^uD>~N04*bRd)SfLr}%sqkj9H};sms}Z|r`@hE>Fp
q=hQY;zP@3V#MFu~_5a3vmW=sKaO|kK5txPKpGE$F%7nsZc>e($^7hLB
--- a/js/src/jit-test/tests/debug/Frame-live-07.js
+++ b/js/src/jit-test/tests/debug/Frame-live-07.js
@@ -29,28 +29,25 @@ function test(when, what) {
     dbg.onDebuggerStatement = frame => {
         dbg.onEnterFrame = frame => {
             frame.onPop = function() {
                 return tick(this);
             };
             return tick(frame);
         };
         let result = frame.eval("for (let _ of f(0)) {}");
-        if (result && "stack" in result) {
-          result.stack = true;
-        }
         assertDeepEq(result, what);
     };
     g.eval("debugger;");
 
     assertEq(t, when);
     assertEq(poppedFrame.live, false);
     assertErrorMessage(() => poppedFrame.older,
                        Error,
                        "Debugger.Frame is not live");
 }
 
 for (let when = 0; when < 6; when++) {
-    for (let what of [null, {throw: "fit", stack: true}]) {
+    for (let what of [null, {throw: "fit"}]) {
         test(when, what);
     }
 }
 
--- a/js/src/jit-test/tests/debug/Object-apply-01.js
+++ b/js/src/jit-test/tests/debug/Object-apply-01.js
@@ -38,21 +38,21 @@ function test(usingApply) {
     dbg.onDebuggerStatement = function (frame) {
         assertEq((usingApply ? frame.arguments[0].apply(null, ['one', 'two'])
                              : frame.arguments[0].call(null, 'one', 'two')).return,
                  2);
         hits++;
     };
     g.eval("f(function () { return arguments.length; });");
 
-    // Exceptions are reported as {throw,stack} completion values.
+    // Exceptions are reported as {throw:} completion values.
     dbg.onDebuggerStatement = function (frame) {
         var lose = frame.arguments[0];
         var cv = usingApply ? lose.apply(null, []) : lose.call(null);
-        assertEq(Object.keys(cv).join(","), "throw,stack");
+        assertEq(Object.keys(cv).join(","), "throw");
         assertEq(cv.throw, frame.callee);
         hits++;
     };
     g.eval("f(function lose() { throw f; });");
 }
 
 test(true);
 test(false);
deleted file mode 100644
--- a/js/src/jit-test/tests/debug/onExceptionUnwind-resumption-05.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Make sure that stacks in completion values are not lost when an exception
-// unwind hook returns undefined.
-
-let g = newGlobal({ newCompartment: true });
-g.eval(`
-  function foo() {
-    bar();
-  }
-  function bar() {
-    throw new Error();
-  }
-`);
-
-let dbg = Debugger(g);
-let unwindHits = 0, popHits = 0;
-dbg.onExceptionUnwind = frame => {
-  unwindHits++;
-  return undefined;
-}
-dbg.onEnterFrame = frame => {
-  frame.onPop = completion => {
-    assertEq(completion.stack.functionDisplayName, "bar");
-    popHits++;
-  };
-};
-
-try {
-  g.eval("foo()");
-} catch (e) {}
-assertEq(unwindHits, 3);
-assertEq(popHits, 3);
-dbg.removeDebuggee(g);
deleted file mode 100644
--- a/js/src/jit-test/tests/debug/resumption-09.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Test exception stack behavior when reusing completion values as resumption
-// values.
-
-load(libdir + "asserts.js");
-
-var g = newGlobal({newCompartment: true});
-g.eval(`
-  function foo() {
-    bar();
-  }
-  function bar() {
-    debugger;
-  }
-  function baz() {
-    throw new Error();
-  }
-`);
-
-var dbg = Debugger(g);
-dbg.onDebuggerStatement = frame => {
-  return frame.eval("baz()");
-};
-
-let popHits = 0;
-dbg.onEnterFrame = frame => {
-  frame.onPop = completion => {
-    popHits++;
-    // Resumption values ignore any 'stack' property, and the script location of
-    // the place where the hook was called will be used when throwing.
-    if (popHits <= 2) {
-      assertEq(completion.stack.functionDisplayName, "baz");
-    } else {
-      assertEq(completion.stack.functionDisplayName, "bar");
-    }
-  };
-};
-
-try {
-  g.eval("foo()");
-} catch (e) {}
-assertEq(popHits, 5);
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1037,19 +1037,18 @@ bool Debugger::slowPathOnLeaveFrame(JSCo
   }
   if (frames.empty()) {
     return frameOk;
   }
 
   // Save the frame's completion value.
   ResumeMode resumeMode;
   RootedValue value(cx);
-  RootedSavedFrame exnStack(cx);
   Debugger::resultToCompletion(cx, frameOk, frame.returnValue(), &resumeMode,
-                               &value, &exnStack);
+                               &value);
 
   // Preserve the debuggee's microtask event queue while we run the hooks, so
   // the debugger's microtask checkpoints don't run from the debuggee's
   // microtasks, and vice versa.
   JS::AutoDebuggerJobQueueInterruption adjqi;
   if (!adjqi.init(cx)) {
     return false;
   }
@@ -1079,18 +1078,17 @@ bool Debugger::slowPathOnLeaveFrame(JSCo
         }
 
         // Call the onPop handler.
         ResumeMode nextResumeMode = resumeMode;
         RootedValue nextValue(cx, wrappedValue);
         bool success;
         {
           AutoSetGeneratorRunning asgr(cx, genObj);
-          success = handler->onPop(cx, frameobj, nextResumeMode, &nextValue,
-                                   exnStack);
+          success = handler->onPop(cx, frameobj, nextResumeMode, &nextValue);
         }
         nextResumeMode = dbg->processParsedHandlerResult(
             ar, frame, pc, success, nextResumeMode, &nextValue);
         adjqi.runJobs();
 
         // At this point, we are back in the debuggee compartment, and
         // any error has been wrapped up as a completion value.
         MOZ_ASSERT(cx->compartment() == debuggeeGlobal->compartment());
@@ -1108,23 +1106,17 @@ bool Debugger::slowPathOnLeaveFrame(JSCo
   // Establish (resumeMode, value) as our resumption value.
   switch (resumeMode) {
     case ResumeMode::Return:
       frame.setReturnValue(value);
       success = true;
       return true;
 
     case ResumeMode::Throw:
-      // If we have a stack from the original throw, use it instead of
-      // associating the throw with the current execution point.
-      if (exnStack) {
-        cx->setPendingException(value, exnStack);
-      } else {
-        cx->setPendingExceptionAndCaptureStack(value);
-      }
+      cx->setPendingExceptionAndCaptureStack(value);
       return false;
 
     case ResumeMode::Terminate:
       MOZ_ASSERT(!cx->isExceptionPending());
       return false;
 
     default:
       MOZ_CRASH("bad final onLeaveFrame resume mode");
@@ -1892,47 +1884,44 @@ ResumeMode Debugger::processHandlerResul
                        resumeMode, vp);
 }
 
 /*** Debuggee completion values *********************************************/
 
 /* static */
 void Debugger::resultToCompletion(JSContext* cx, bool ok, const Value& rv,
                                   ResumeMode* resumeMode,
-                                  MutableHandleValue value,
-                                  MutableHandleSavedFrame exnStack) {
+                                  MutableHandleValue value) {
   MOZ_ASSERT_IF(ok, !cx->isExceptionPending());
 
   if (ok) {
     *resumeMode = ResumeMode::Return;
     value.set(rv);
   } else if (cx->isExceptionPending()) {
     *resumeMode = ResumeMode::Throw;
     if (!cx->getPendingException(value)) {
       *resumeMode = ResumeMode::Terminate;
     }
-    exnStack.set(cx->getPendingExceptionStack());
     cx->clearPendingException();
   } else {
     *resumeMode = ResumeMode::Terminate;
     value.setUndefined();
   }
 }
 
 bool Debugger::newCompletionValue(JSContext* cx, ResumeMode resumeMode,
-                                  const Value& value_, SavedFrame* exnStack_,
+                                  const Value& value_,
                                   MutableHandleValue result) {
   // We must be in the debugger's compartment, since that's where we want
   // to construct the completion value.
   cx->check(object.get());
   cx->check(value_);
 
   RootedId key(cx);
   RootedValue value(cx, value_);
-  RootedSavedFrame exnStack(cx, exnStack_);
 
   switch (resumeMode) {
     case ResumeMode::Return:
       key = NameToId(cx->names().return_);
       break;
 
     case ResumeMode::Throw:
       key = NameToId(cx->names().throw_);
@@ -1948,40 +1937,30 @@ bool Debugger::newCompletionValue(JSCont
 
   // Common tail for ResumeMode::Return and ResumeMode::Throw.
   RootedPlainObject obj(cx, NewBuiltinClassInstance<PlainObject>(cx));
   if (!obj ||
       !NativeDefineDataProperty(cx, obj, key, value, JSPROP_ENUMERATE)) {
     return false;
   }
 
-  if (exnStack) {
-    RootedId nkey(cx, NameToId(cx->names().stack));
-    RootedValue nvalue(cx, ObjectValue(*exnStack));
-    if (!cx->compartment()->wrap(cx, &nvalue) ||
-        !NativeDefineDataProperty(cx, obj, nkey, nvalue, JSPROP_ENUMERATE)) {
-      return false;
-    }
-  }
-
   result.setObject(*obj);
   return true;
 }
 
 bool Debugger::receiveCompletionValue(Maybe<AutoRealm>& ar, bool ok,
                                       HandleValue val, MutableHandleValue vp) {
   JSContext* cx = ar->context();
 
   ResumeMode resumeMode;
   RootedValue value(cx);
-  RootedSavedFrame exnStack(cx);
-  resultToCompletion(cx, ok, val, &resumeMode, &value, &exnStack);
+  resultToCompletion(cx, ok, val, &resumeMode, &value);
   ar.reset();
   return wrapDebuggeeValue(cx, &value) &&
-         newCompletionValue(cx, resumeMode, value, exnStack, vp);
+         newCompletionValue(cx, resumeMode, value, vp);
 }
 
 /*** Firing debugger hooks **************************************************/
 
 static bool CallMethodIfPresent(JSContext* cx, HandleObject obj,
                                 const char* name, size_t argc, Value* argv,
                                 MutableHandleValue rval) {
   rval.setUndefined();
@@ -8882,35 +8861,34 @@ void ScriptedOnPopHandler::drop() {
 }
 
 void ScriptedOnPopHandler::trace(JSTracer* tracer) {
   TraceEdge(tracer, &object_, "OnStepHandlerFunction.object");
 }
 
 bool ScriptedOnPopHandler::onPop(JSContext* cx, HandleDebuggerFrame frame,
                                  ResumeMode& resumeMode,
-                                 MutableHandleValue vp,
-                                 HandleSavedFrame exnStack) {
+                                 MutableHandleValue vp) {
   Debugger* dbg = frame->owner();
 
   // Make it possible to distinguish 'return' from 'await' completions.
   // Bug 1470558 will investigate a more robust solution.
   bool isAfterAwait = false;
   AbstractFramePtr referent = DebuggerFrame::getReferent(frame);
   if (resumeMode == ResumeMode::Return && referent &&
       referent.isFunctionFrame() && referent.callee()->isAsync() &&
       !referent.callee()->isGenerator()) {
     AutoRealm ar(cx, referent.callee());
     if (auto* genObj = GetGeneratorObjectForFrame(cx, referent)) {
       isAfterAwait = !genObj->isClosed() && genObj->isRunning();
     }
   }
 
   RootedValue completion(cx);
-  if (!dbg->newCompletionValue(cx, resumeMode, vp, exnStack, &completion)) {
+  if (!dbg->newCompletionValue(cx, resumeMode, vp, &completion)) {
     return false;
   }
 
   if (isAfterAwait) {
     RootedObject obj(cx, &completion.toObject());
     if (!DefineDataProperty(cx, obj, cx->names().await, TrueHandleValue)) {
       return false;
     }
@@ -9359,18 +9337,17 @@ static bool EvaluateInEnv(JSContext* cx,
   return ExecuteKernel(cx, script, *env, NullValue(), frame, rval.address());
 }
 
 static bool DebuggerGenericEval(JSContext* cx,
                                 const mozilla::Range<const char16_t> chars,
                                 HandleObject bindings,
                                 const EvalOptions& options,
                                 ResumeMode& resumeMode,
-                                MutableHandleValue value,
-                                MutableHandleSavedFrame exnStack, Debugger* dbg,
+                                MutableHandleValue value, Debugger* dbg,
                                 HandleObject envArg, FrameIter* iter) {
   // Either we're specifying the frame, or a global.
   MOZ_ASSERT_IF(iter, !envArg);
   MOZ_ASSERT_IF(!iter, envArg && IsGlobalLexicalEnvironment(envArg));
 
   // Gather keys and values of bindings, if any. This must be done in the
   // debugger compartment, since that is where any exceptions must be thrown.
   RootedIdVector keys(cx);
@@ -9441,41 +9418,40 @@ static bool DebuggerGenericEval(JSContex
   LeaveDebuggeeNoExecute nnx(cx);
   RootedValue rval(cx);
   AbstractFramePtr frame = iter ? iter->abstractFramePtr() : NullFramePtr();
 
   bool ok = EvaluateInEnv(
       cx, env, frame, chars,
       options.filename() ? options.filename() : "debugger eval code",
       options.lineno(), &rval);
-  Debugger::resultToCompletion(cx, ok, rval, &resumeMode, value, exnStack);
+  Debugger::resultToCompletion(cx, ok, rval, &resumeMode, value);
   ar.reset();
   return dbg->wrapDebuggeeValue(cx, value);
 }
 
 /* static */
 bool DebuggerFrame::eval(JSContext* cx, HandleDebuggerFrame frame,
                          mozilla::Range<const char16_t> chars,
                          HandleObject bindings, const EvalOptions& options,
-                         ResumeMode& resumeMode, MutableHandleValue value,
-                         MutableHandleSavedFrame exnStack) {
+                         ResumeMode& resumeMode, MutableHandleValue value) {
   MOZ_ASSERT(frame->isLive());
 
   Debugger* dbg = frame->owner();
 
   Maybe<FrameIter> maybeIter;
   if (!DebuggerFrame::getFrameIter(cx, frame, maybeIter)) {
     return false;
   }
   FrameIter& iter = *maybeIter;
 
   UpdateFrameIterPc(iter);
 
   return DebuggerGenericEval(cx, chars, bindings, options, resumeMode, value,
-                             exnStack, dbg, nullptr, &iter);
+                             dbg, nullptr, &iter);
 }
 
 /* static */
 bool DebuggerFrame::isLive() const { return !!getPrivate(); }
 
 OnStepHandler* DebuggerFrame::onStepHandler() const {
   Value value = getReservedSlot(JSSLOT_DEBUGFRAME_ONSTEP_HANDLER);
   return value.isUndefined() ? nullptr
@@ -10049,24 +10025,22 @@ bool DebuggerFrame::evalMethod(JSContext
 
   EvalOptions options;
   if (!ParseEvalOptions(cx, args.get(1), options)) {
     return false;
   }
 
   ResumeMode resumeMode;
   RootedValue value(cx);
-  RootedSavedFrame exnStack(cx);
   if (!DebuggerFrame::eval(cx, frame, chars, nullptr, options, resumeMode,
-                           &value, &exnStack)) {
-    return false;
-  }
-
-  return frame->owner()->newCompletionValue(cx, resumeMode, value, exnStack,
-                                            args.rval());
+                           &value)) {
+    return false;
+  }
+
+  return frame->owner()->newCompletionValue(cx, resumeMode, value, args.rval());
 }
 
 /* static */
 bool DebuggerFrame::evalWithBindingsMethod(JSContext* cx, unsigned argc,
                                            Value* vp) {
   THIS_DEBUGGER_FRAME(cx, argc, vp, "evalWithBindings", args, frame);
   if (!args.requireAtLeast(cx, "Debugger.Frame.prototype.evalWithBindings",
                            2)) {
@@ -10087,24 +10061,22 @@ bool DebuggerFrame::evalWithBindingsMeth
 
   EvalOptions options;
   if (!ParseEvalOptions(cx, args.get(2), options)) {
     return false;
   }
 
   ResumeMode resumeMode;
   RootedValue value(cx);
-  RootedSavedFrame exnStack(cx);
   if (!DebuggerFrame::eval(cx, frame, chars, bindings, options, resumeMode,
-                           &value, &exnStack)) {
-    return false;
-  }
-
-  return frame->owner()->newCompletionValue(cx, resumeMode, value, exnStack,
-                                            args.rval());
+                           &value)) {
+    return false;
+  }
+
+  return frame->owner()->newCompletionValue(cx, resumeMode, value, args.rval());
 }
 
 /* static */
 bool DebuggerFrame::construct(JSContext* cx, unsigned argc, Value* vp) {
   JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                             "Debugger.Frame");
   return false;
 }
@@ -11228,23 +11200,22 @@ bool DebuggerObject::executeInGlobalMeth
 
   EvalOptions options;
   if (!ParseEvalOptions(cx, args.get(1), options)) {
     return false;
   }
 
   ResumeMode resumeMode;
   RootedValue value(cx);
-  RootedSavedFrame exnStack(cx);
   if (!DebuggerObject::executeInGlobal(cx, object, chars, nullptr, options,
-                                       resumeMode, &value, &exnStack)) {
-    return false;
-  }
-
-  return object->owner()->newCompletionValue(cx, resumeMode, value, exnStack,
+                                       resumeMode, &value)) {
+    return false;
+  }
+
+  return object->owner()->newCompletionValue(cx, resumeMode, value,
                                              args.rval());
 }
 
 /* static */
 bool DebuggerObject::executeInGlobalWithBindingsMethod(JSContext* cx,
                                                        unsigned argc,
                                                        Value* vp) {
   THIS_DEBUGOBJECT(cx, argc, vp, "executeInGlobalWithBindings", args, object);
@@ -11272,23 +11243,22 @@ bool DebuggerObject::executeInGlobalWith
 
   EvalOptions options;
   if (!ParseEvalOptions(cx, args.get(2), options)) {
     return false;
   }
 
   ResumeMode resumeMode;
   RootedValue value(cx);
-  RootedSavedFrame exnStack(cx);
   if (!DebuggerObject::executeInGlobal(cx, object, chars, bindings, options,
-                                       resumeMode, &value, &exnStack)) {
-    return false;
-  }
-
-  return object->owner()->newCompletionValue(cx, resumeMode, value, exnStack,
+                                       resumeMode, &value)) {
+    return false;
+  }
+
+  return object->owner()->newCompletionValue(cx, resumeMode, value,
                                              args.rval());
 }
 
 /* static */
 bool DebuggerObject::makeDebuggeeValueMethod(JSContext* cx, unsigned argc,
                                              Value* vp) {
   THIS_DEBUGOBJECT(cx, argc, vp, "makeDebuggeeValue", args, object);
   if (!args.requireAtLeast(cx, "Debugger.Object.prototype.makeDebuggeeValue",
@@ -12243,26 +12213,25 @@ bool DebuggerObject::forceLexicalInitial
 }
 
 /* static */
 bool DebuggerObject::executeInGlobal(JSContext* cx, HandleDebuggerObject object,
                                      mozilla::Range<const char16_t> chars,
                                      HandleObject bindings,
                                      const EvalOptions& options,
                                      ResumeMode& resumeMode,
-                                     MutableHandleValue value,
-                                     MutableHandleSavedFrame exnStack) {
+                                     MutableHandleValue value) {
   MOZ_ASSERT(object->isGlobal());
 
   Rooted<GlobalObject*> referent(cx, &object->referent()->as<GlobalObject>());
   Debugger* dbg = object->owner();
 
   RootedObject globalLexical(cx, &referent->lexicalEnvironment());
   return DebuggerGenericEval(cx, chars, bindings, options, resumeMode, value,
-                             exnStack, dbg, globalLexical, nullptr);
+                             dbg, globalLexical, nullptr);
 }
 
 /* static */
 bool DebuggerObject::makeDebuggeeValue(JSContext* cx,
                                        HandleDebuggerObject object,
                                        HandleValue value_,
                                        MutableHandleValue result) {
   RootedObject referent(cx, object->referent());
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -1145,33 +1145,30 @@ class Debugger : private mozilla::Linked
   MOZ_MUST_USE bool getFrame(JSContext* cx, const FrameIter& iter,
                              MutableHandleDebuggerFrame result);
 
   /*
    * Set |*resumeMode| and |*value| to a (ResumeMode, Value) pair reflecting a
    * standard SpiderMonkey call state: a boolean success value |ok|, a return
    * value |rv|, and a context |cx| that may or may not have an exception set.
    * If an exception was pending on |cx|, it is cleared (and |ok| is asserted
-   * to be false). On exceptional returns, exnStack will be set to any stack
-   * associated with the original throw, if available.
+   * to be false).
    */
   static void resultToCompletion(JSContext* cx, bool ok, const Value& rv,
                                  ResumeMode* resumeMode,
-                                 MutableHandleValue value,
-                                 MutableHandleSavedFrame exnStack);
+                                 MutableHandleValue value);
 
   /*
    * Set |*result| to a JavaScript completion value corresponding to
    * |resumeMode| and |value|. |value| should be the return value or exception
-   * value, not wrapped as a debuggee value. When throwing an exception,
-   * |exnStack| may be set to the stack when the value was thrown. |cx| must be
-   * in the debugger compartment.
+   * value, not wrapped as a debuggee value. |cx| must be in the debugger
+   * compartment.
    */
   MOZ_MUST_USE bool newCompletionValue(JSContext* cx, ResumeMode resumeMode,
-                                       const Value& value, SavedFrame* exnStack,
+                                       const Value& value,
                                        MutableHandleValue result);
 
   /*
    * Precondition: we are in the debuggee realm (ar is entered) and ok is true
    * if the operation in the debuggee realm succeeded, false on error or
    * exception.
    *
    * Postcondition: we are in the debugger realm, having called `ar.reset()`
@@ -1409,29 +1406,27 @@ struct OnPopHandler : Handler {
   /*
    * If a frame is about the be popped, this method is called with the frame
    * as argument, and `resumeMode` and `vp` set to a completion value specifying
    * how this frame's execution completed. If successful, this method should
    * return true, with `resumeMode` and `vp` set to a resumption value
    * specifying how execution should continue.
    */
   virtual bool onPop(JSContext* cx, HandleDebuggerFrame frame,
-                     ResumeMode& resumeMode, MutableHandleValue vp,
-                     HandleSavedFrame exnStack) = 0;
+                     ResumeMode& resumeMode, MutableHandleValue vp) = 0;
 };
 
 class ScriptedOnPopHandler final : public OnPopHandler {
  public:
   explicit ScriptedOnPopHandler(JSObject* object);
   virtual JSObject* object() const override;
   virtual void drop() override;
   virtual void trace(JSTracer* tracer) override;
   virtual bool onPop(JSContext* cx, HandleDebuggerFrame frame,
-                     ResumeMode& resumeMode, MutableHandleValue vp,
-                     HandleSavedFrame exnStack) override;
+                     ResumeMode& resumeMode, MutableHandleValue vp) override;
 
  private:
   HeapPtr<JSObject*> object_;
 };
 
 class DebuggerFrame : public NativeObject {
   friend class DebuggerArguments;
   friend class ScriptedOnStepHandler;
@@ -1472,18 +1467,17 @@ class DebuggerFrame : public NativeObjec
                                             HandleDebuggerFrame frame,
                                             OnStepHandler* handler);
 
   static MOZ_MUST_USE bool eval(JSContext* cx, HandleDebuggerFrame frame,
                                 mozilla::Range<const char16_t> chars,
                                 HandleObject bindings,
                                 const EvalOptions& options,
                                 ResumeMode& resumeMode,
-                                MutableHandleValue value,
-                                MutableHandleSavedFrame exnStack);
+                                MutableHandleValue value);
 
   bool isLive() const;
   OnStepHandler* onStepHandler() const;
   OnPopHandler* onPopHandler() const;
   void setOnPopHandler(OnPopHandler* handler);
 
   /*
    * Called after a generator/async frame is resumed, before exposing this
@@ -1644,18 +1638,17 @@ class DebuggerObject : public NativeObje
   static MOZ_MUST_USE bool forceLexicalInitializationByName(
       JSContext* cx, HandleDebuggerObject object, HandleId id, bool& result);
   static MOZ_MUST_USE bool executeInGlobal(JSContext* cx,
                                            HandleDebuggerObject object,
                                            mozilla::Range<const char16_t> chars,
                                            HandleObject bindings,
                                            const EvalOptions& options,
                                            ResumeMode& resumeMode,
-                                           MutableHandleValue value,
-                                           MutableHandleSavedFrame exnStack);
+                                           MutableHandleValue value);
   static MOZ_MUST_USE bool makeDebuggeeValue(JSContext* cx,
                                              HandleDebuggerObject object,
                                              HandleValue value,
                                              MutableHandleValue result);
   static MOZ_MUST_USE bool unsafeDereference(JSContext* cx,
                                              HandleDebuggerObject object,
                                              MutableHandleObject result);
   static MOZ_MUST_USE bool unwrap(JSContext* cx, HandleDebuggerObject object,