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

Bug 1274922 part 1 - Remove ShellRuntime::gotError. r=jonco

Browse Source
This commit is contained in:
Jan de Mooij 2016-05-28 13:10:42 +02:00
parent 0f44adfaff
commit 8164408c7e
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,6 @@ struct ShellRuntime
int exitCode;
bool quitting;
bool gotError;
};
// Shell state set once at startup.
@ -322,8 +321,7 @@ ShellRuntime::ShellRuntime(JSRuntime* rt)
watchdogTimeout(0),
sleepWakeup(nullptr),
exitCode(0),
quitting(false),
gotError(false)
quitting(false)
{}
static ShellRuntime*
@ -527,9 +525,7 @@ RunFile(JSContext* cx, const char* filename, FILE* file, bool compileOnly)
.setIsRunOnce(true)
.setNoScriptRval(true);
sr->gotError = false;
(void) JS::Compile(cx, options, file, &script);
MOZ_ASSERT_IF(!script, sr->gotError);
}
#ifdef DEBUG
@ -5990,7 +5986,7 @@ js::shell::my_ErrorReporter(JSContext* cx, const char* message, JSErrorReport* r
if (JS_IsExceptionPending(cx))
(void) JS_GetPendingException(cx, &exn);
sr->gotError = PrintError(cx, fp, message, report, reportWarnings);
(void) PrintError(cx, fp, message, report, reportWarnings);
if (!exn.isUndefined()) {
JS::AutoSaveExceptionState savedExc(cx);
if (!PrintStackTrace(cx, exn))
@ -6006,16 +6002,6 @@ js::shell::my_ErrorReporter(JSContext* cx, const char* message, JSErrorReport* r
}
}
static void
my_OOMCallback(JSContext* cx, void* data)
{
// If a script is running, the engine is about to throw the string "out of
// memory", which may or may not be caught. Otherwise the engine will just
// unwind and return null/false, with no exception set.
if (!JS_IsRunning(cx))
GetShellRuntime(cx)->gotError = true;
}
static bool
global_enumerate(JSContext* cx, HandleObject obj)
{
@ -7419,7 +7405,6 @@ main(int argc, char** argv, char** envp)
// Waiting is allowed on the shell's main thread, for now.
JS_SetFutexCanWait(rt);
JS_SetErrorReporter(rt, my_ErrorReporter);
JS::SetOutOfMemoryCallback(rt, my_OOMCallback, nullptr);
if (!SetRuntimeOptions(rt, op))
return 1;