Fixed bogus assert (bug 597871 fallout, a=orange).
authorDavid Anderson <danderson@mozilla.com>
Mon, 27 Sep 2010 20:21:11 -0700
changeset 54739 caacc64334ca30e7e9310647618c9671be32fb5c
parent 54738 594031f9877d1074f320cebcc3f1a004f549d3bf
child 54740 f9a5fbc24118fdf25fe62ae443ac9dff88e03539
push id16011
push userrsayre@mozilla.com
push dateWed, 29 Sep 2010 06:01:57 +0000
treeherdermozilla-central@d7e659b4f80c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersorange
bugs597871
milestone2.0b7pre
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
Fixed bogus assert (bug 597871 fallout, a=orange).
js/src/methodjit/InvokeHelpers.cpp
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -680,17 +680,17 @@ HandleErrorInExcessFrames(VMFrame &f, JS
             break;
 
         /* Unwind and return. */
         returnOK &= bool(js_UnwindScope(cx, 0, returnOK || cx->throwing));
         returnOK = InlineReturn(f, returnOK);
     }
 
     JS_ASSERT(&f.regs == cx->regs);
-    JS_ASSERT_IF(returnOK, cx->fp() == stopFp);
+    JS_ASSERT_IF(!returnOK, cx->fp() == stopFp);
 
     return returnOK;
 }
 
 static inline bool
 AtSafePoint(JSContext *cx)
 {
     JSStackFrame *fp = cx->fp();