Backed out changeset c10e63cba3b6
authorSteve Fink <sfink@mozilla.com>
Mon, 24 Jan 2011 15:07:00 -0800
changeset 61241 dcb713798848b074b3bb714b878c98be621bd388
parent 61240 c10e63cba3b67bb7486d1d119ac4422e9781b258
child 61242 c52e5d68a7476f91d4b001b69e5829603f1beb60
push id18277
push usercleary@mozilla.com
push dateTue, 25 Jan 2011 03:52:51 +0000
treeherdermozilla-central@7ee91bd90e7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b10pre
backs outc10e63cba3b67bb7486d1d119ac4422e9781b258
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 changeset c10e63cba3b6
js/src/jscntxt.cpp
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -2028,18 +2028,19 @@ 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, it will
- * set a new (uncatchable) exception to be used in place of the original.
+ * 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.
  */
 void
 JSContext::wrapPendingException()
 {
     Value v = getPendingException();
     clearPendingException();
     if (compartment->wrap(this, &v))
         setPendingException(v);