☠☠ backed out by dcb713798848 ☠ ☠ | |
author | Steve Fink <sfink@mozilla.com> |
Mon, 24 Jan 2011 14:43:39 -0800 | |
changeset 61240 | c10e63cba3b67bb7486d1d119ac4422e9781b258 |
parent 61239 | d54eac606dd725129d2d18324aac1ca73e652e68 |
child 61241 | dcb713798848b074b3bb714b878c98be621bd388 |
push id | 18277 |
push user | cleary@mozilla.com |
push date | Tue, 25 Jan 2011 03:52:51 +0000 |
treeherder | mozilla-central@7ee91bd90e7a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 627943 |
milestone | 2.0b10pre |
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
|
--- a/js/src/jscntxt.cpp +++ b/js/src/jscntxt.cpp @@ -2028,19 +2028,18 @@ error: * If we try to use the context without a selected compartment, * we will crash. */ compartment = NULL; } /* * Since this function is only called in the context of a pending exception, - * the caller must subsequently take an error path. If wrapping fails, we leave - * the exception cleared, which, in the context of an error path, will be - * interpreted as an uncatchable exception. + * the caller must subsequently take an error path. If wrapping fails, it will + * set a new (uncatchable) exception to be used in place of the original. */ void JSContext::wrapPendingException() { Value v = getPendingException(); clearPendingException(); if (compartment->wrap(this, &v)) setPendingException(v);