Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1547131 - JS shell: show the stack for thrown values that are not Error objects. r=jorendorff

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D28967

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Schuster 2019-05-02 11:12:27 +00:00
parent 5e3db1106f
commit 069f9b2851
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
js/src/shell/js.cpp
View File

@ -9432,30 +9432,12 @@ static FILE* ErrorFilePointer() {
return stderr;
}
static bool PrintStackTrace(JSContext* cx, HandleValue exn) {
if (!exn.isObject()) {
return false;
}
Maybe<JSAutoRealm> ar;
RootedObject exnObj(cx, &exn.toObject());
if (IsCrossCompartmentWrapper(exnObj)) {
exnObj = UncheckedUnwrap(exnObj);
ar.emplace(cx, exnObj);
}
// Ignore non-ErrorObject thrown by |throw| statement.
if (!exnObj->is<ErrorObject>()) {
static bool PrintStackTrace(JSContext* cx, HandleObject stackObj) {
if (!stackObj || !stackObj->is<SavedFrame>()) {
return true;
}
// Exceptions thrown while compiling top-level script have no stack.
RootedObject stackObj(cx, exnObj->as<ErrorObject>().stack());
if (!stackObj) {
return true;
}
JSPrincipals* principals = exnObj->as<ErrorObject>().realm()->principals();
JSPrincipals* principals = stackObj->nonCCWRealm()->principals();
RootedString stackStr(cx);
if (!BuildStackString(cx, principals, stackObj, &stackStr, 2)) {
return false;
@ -9478,9 +9460,10 @@ js::shell::AutoReportException::~AutoReportException() {
return;
}
// Get exception object before printing and clearing exception.
// Get exception object and stack before printing and clearing exception.
RootedValue exn(cx);
(void)JS_GetPendingException(cx, &exn);
RootedObject stack(cx, GetPendingExceptionStack(cx));
JS_ClearPendingException(cx);
@ -9498,16 +9481,11 @@ js::shell::AutoReportException::~AutoReportException() {
FILE* fp = ErrorFilePointer();
PrintError(cx, fp, report.toStringResult(), report.report(), reportWarnings);
{
JS::AutoSaveExceptionState savedExc(cx);
if (!PrintStackTrace(cx, exn)) {
fputs("(Unable to print stack trace)\n", fp);
}
savedExc.restore();
if (!PrintStackTrace(cx, stack)) {
fputs("(Unable to print stack trace)\n", fp);
JS_ClearPendingException(cx);
}
JS_ClearPendingException(cx);
#if defined(DEBUG) || defined(JS_OOM_BREAKPOINT)
// Don't quit the shell if an unhandled exception is reported during OOM
// testing.