Fix to 333916. Error reports resulting from uncaught exceptions get
the JSREPORT_UNCAUGHT_EXCEPTION flag. Moved this code out of #if HAS_ERROR_EXCEPTIONS code, because it applies to all exceptions, not just error exceptions. git-svn-id: svn://10.0.0.236/branches/SpiderMonkeyDev_BRANCH@14279 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -345,7 +345,6 @@ js_ReportErrorNumberVA(JSContext *cx, uintN flags, JSErrorCallback callback,
|
||||
&message, &report, charArgs, ap))
|
||||
return;
|
||||
|
||||
#if JS_HAS_ERROR_EXCEPTIONS
|
||||
/*
|
||||
* Check the error report, and set a JavaScript-catchable exception
|
||||
* if the error is defined to have an associated exception. If an
|
||||
@@ -358,6 +357,7 @@ js_ReportErrorNumberVA(JSContext *cx, uintN flags, JSErrorCallback callback,
|
||||
if (errorNumber == JSMSG_UNCAUGHT_EXCEPTION)
|
||||
report.flags |= JSREPORT_EXCEPTION;
|
||||
|
||||
#if JS_HAS_ERROR_EXCEPTIONS
|
||||
/*
|
||||
* Only call the error reporter if an exception wasn't raised.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user