Merge from TM

2010-07-04 14:49:39 -07:00
parent fd374bdee5 cd0dada05e
commit 0f817f3eaa
1783 changed files with 50279 additions and 29426 deletions
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4032,7 +4032,7 @@ JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent)
        uint32 i = 0, n = uva->length;
        for (; i < n; i++) {
            JSObject *obj = parent;
-            int skip = UPVAR_FRAME_SKIP(uva->vector[i]);
+            int skip = uva->vector[i].level();
            while (--skip > 0) {
                if (!obj) {
                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,