Merge TM -> JM

2011-05-15 11:32:09 -07:00
parent 52be5f6984 d379a06d5f
commit 3735a2e3df
743 changed files with 10691 additions and 5219 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -820,8 +820,7 @@ array_getProperty(JSContext *cx, JSObject *obj, JSObject *receiver, jsid id, Val
        }

        vp->setUndefined();
-        if (js_LookupPropertyWithFlags(cx, proto, id, cx->resolveFlags,
-                                       &obj2, &prop) < 0)
+        if (!LookupPropertyWithFlags(cx, proto, id, cx->resolveFlags, &obj2, &prop))
            return JS_FALSE;

        if (prop && obj2->isNative()) {