[JAEGER] Unbroke build, merge merge merge.

2010-07-05 20:14:42 -07:00
parent 549886a671
commit 711f227978
19 changed files with 260 additions and 293 deletions
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1751,8 +1751,7 @@ JS_GetGlobalForScopeChain(JSContext *cx)
 JS_PUBLIC_API(jsval)
 JS_ComputeThis(JSContext *cx, jsval *vp)
 {
-    assertSameCompartment(cx, JSValueArray(vp, 2));
-    if (!ComputeThisFromVp(cx, Valueify(vp)))
+    if (!ComputeThisFromVpInPlace(cx, Valueify(vp)))
        return JSVAL_NULL;
    return vp[1];
 }