Fix bogus assertion in last patch (for 385393).
authorbrendan@mozilla.org
Thu, 02 Aug 2007 01:21:55 -0700
changeset 4148 df30ed350b7d8d362a8b88ed465e4e90c152a696
parent 4147 b0857d68323b6e02490ee4cefb08f6dd09cd154a
child 4149 67af28602a83f9ec99ee3502921ca1e7f2967db3
push id1
push userbsmedberg@mozilla.com
push dateThu, 20 Mar 2008 16:49:24 +0000
treeherdermozilla-central@61007906a1f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs385393
milestone1.9a7pre
Fix bogus assertion in last patch (for 385393).
js/src/jsinterp.c
--- a/js/src/jsinterp.c
+++ b/js/src/jsinterp.c
@@ -4025,17 +4025,17 @@ interrupt:
                     newifp->frame.dormantNext = NULL;
                     newifp->frame.xmlNamespace = NULL;
                     newifp->frame.blockChain = NULL;
                     newifp->rvp = rvp;
                     newifp->mark = newmark;
 
                     /* Compute the 'this' parameter now that argv is set. */
                     JS_ASSERT(!JSFUN_BOUND_METHOD_TEST(fun->flags));
-                    JS_ASSERT(!PRIMITIVE_THIS_TEST(fun, vp[1]));
+                    JS_ASSERT(!JSVAL_IS_PRIMITIVE(vp[1]));
                     newifp->frame.thisp = (JSObject *)vp[1];
 #ifdef DUMP_CALL_TABLE
                     LogCall(cx, *vp, argc, vp + 2);
 #endif
 
                     /* Push void to initialize local variables. */
                     sp = newsp;
                     while (nvars--)